From a3eea03a38da31783342da8a1fea3fed70c796b4 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Mon, 22 May 2017 06:03:14 -0400 Subject: [PATCH] Firefox 54 compatibility: rename "new" and "delete" XBL methods --- chrome/content/zotero/bindings/noteeditor.xml | 4 ++-- chrome/content/zotero/bindings/tagsbox.xml | 6 +++--- chrome/content/zotero/bindings/tagselector.xml | 4 ++-- test/tests/tagSelectorTest.js | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/chrome/content/zotero/bindings/noteeditor.xml b/chrome/content/zotero/bindings/noteeditor.xml index 9bd20e27d..295017cf6 100644 --- a/chrome/content/zotero/bindings/noteeditor.xml +++ b/chrome/content/zotero/bindings/noteeditor.xml @@ -442,7 +442,7 @@ // If editable and no existing tags, open new empty row var tagsBox = this.id('tags'); if (tagsBox.mode == 'edit' && tagsBox.count == 0) { - this.id('tags').new(); + this.id('tags').newTag(); } ]]> @@ -573,7 +573,7 @@ tagsbox and tagsLabel above, so be sure to update fixPopup() if it changes --> diff --git a/chrome/content/zotero/bindings/tagsbox.xml b/chrome/content/zotero/bindings/tagsbox.xml index 265ef25d5..9971d3bd8 100644 --- a/chrome/content/zotero/bindings/tagsbox.xml +++ b/chrome/content/zotero/bindings/tagsbox.xml @@ -725,7 +725,7 @@ - + + oncommand="document.getBindingParent(this).newTag();"/> diff --git a/chrome/content/zotero/bindings/tagselector.xml b/chrome/content/zotero/bindings/tagselector.xml index 36f43ff12..f10463302 100644 --- a/chrome/content/zotero/bindings/tagselector.xml +++ b/chrome/content/zotero/bindings/tagselector.xml @@ -805,7 +805,7 @@ - + + oncommand="document.getBindingParent(this).deleteTag(_popupNode.textContent); event.stopPropagation()"/> diff --git a/test/tests/tagSelectorTest.js b/test/tests/tagSelectorTest.js index 3d3f4e8fc..4737b2141 100644 --- a/test/tests/tagSelectorTest.js +++ b/test/tests/tagSelectorTest.js @@ -363,7 +363,7 @@ describe("Tag Selector", function () { promise = waitForTagSelector(win); var dialogPromise = waitForDialog(); var tagSelector = doc.getElementById('zotero-tag-selector'); - yield tagSelector.delete("A"); + yield tagSelector.deleteTag("A"); yield promise; // Tag selector shouldn't show the deleted item's tag