Skip to content

Commit 8db3113

Browse files
committed
disabled pdf annotation buttons and fixed rename directory in nav bar
SQUASHED: AUTO-COMMIT-src-components-tools-lively-container.js,AUTO-COMMIT-src-components-widgets-lively-pdf.html,AUTO-COMMIT-src-components-widgets-lively-pdf.js,
1 parent 0556224 commit 8db3113

File tree

3 files changed

+9
-20
lines changed

3 files changed

+9
-20
lines changed

src/components/tools/lively-container.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -774,10 +774,6 @@ export default class Container extends Morph {
774774
this.followPath(url)
775775
}
776776
/*MD ## File Operations MD*/
777-
778-
779-
780-
781777
async deleteFile(url, urls) {
782778
lively.notify("deleteFile " + url)
783779
if (!urls || !urls.includes(url)) {
@@ -832,7 +828,9 @@ export default class Container extends Morph {
832828

833829
async renameFile(url, followFile=true, proposedNewName) {
834830
url = "" + url
831+
url = url.replace(/\/$/,"") // case of single dir
835832
var base = url.replace(/[^/]*$/,"")
833+
836834
var name = proposedNewName || decodeURI(url.replace(/.*\//,""))
837835
var newName = await lively.prompt("rename", name)
838836
if (!newName) {

src/components/widgets/lively-pdf.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
</div>
3737

3838
<div class="pdfEditButtons">
39+
<!-- Seminar prototype seems not to work any more...
3940
<button id="pdf-add-button">
4041
<i class="fa fa-plus"></i>
4142
</button>
@@ -51,6 +52,7 @@
5152
<button id="pdf-cancel-button" disabled>
5253
<i class="fa fa-ban"></i>
5354
</button>
55+
-->
5456
<button id="prevButton">
5557
<i class="fa fa-arrow-left"></i>
5658
</button>

src/components/widgets/lively-pdf.js

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ export default class LivelyPDF extends Morph {
2525

2626
lively.html.registerKeys(this, "PDF")
2727

28-
// Register event handlers for edit mode for annotations
29-
lively.addEventListener("pdf", this.getSubmorph("#pdf-edit-button"), "click",
30-
() => this.onPdfEdit());
31-
lively.addEventListener("pdf", this.getSubmorph("#pdf-add-button"), "click",
32-
() => this.onPdfAdd());
33-
lively.addEventListener("pdf", this.getSubmorph("#pdf-save-button"), "click",
34-
() => this.onPdfSave());
35-
lively.addEventListener("pdf", this.getSubmorph("#pdf-cancel-button"), "click",
36-
() => this.onPdfCancel());
37-
lively.addEventListener("pdf", this.getSubmorph("#pdf-delete-button"), "click",
38-
() => this.onPdfDelete());
3928
this.registerButtons()
4029

4130
this.currentPage = this.currentPage
@@ -232,17 +221,17 @@ export default class LivelyPDF extends Morph {
232221
this.pdfViewer.currentScaleValue = 'page-width';
233222
}
234223

235-
onPdfEdit() {
224+
onPdfEditButton() {
236225
this.setDeleteMode(false);
237226
this.enableEditMode();
238227
}
239228

240-
onPdfDelete() {
229+
onPdfDeleteButton() {
241230
this.disableEditMode();
242231
this.setDeleteMode(!this.deleteMode);
243232
}
244233

245-
onPdfAdd() {
234+
onPdfAddButton() {
246235
if (this.shadowRoot.getSelection().rangeCount > 0) {
247236
let currentPageNumber = this.getPageNumber(this.shadowRoot.getSelection());
248237
let scale = this.pdfViewer._pages[0].viewport.scale;
@@ -280,11 +269,11 @@ export default class LivelyPDF extends Morph {
280269
}
281270
}
282271

283-
onPdfSave() {
272+
onPdfSaveButton() {
284273
this.savePdf();
285274
}
286275

287-
onPdfCancel() {
276+
onPdfCancelButton() {
288277
this.disableEditMode();
289278
}
290279

0 commit comments

Comments
 (0)