Fixes #163: Context menu entries now working with TB 102 and TB 115!

eyalroz · Jul 15, 2023 · 8fe9fda · 8fe9fda
1 parent 5539fda
commit 8fe9fda
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 5 deletions.
diff --git a/jar.mn b/jar.mn
@@ -11,6 +11,7 @@ removedupes.jar:
 *   content/removedupes-dialog.js                     (src/chrome/content/removedupes-dialog.js)
     content/removedupes-set-preference-types.js       (src/chrome/content/removedupes-set-preference-types.js)
     content/overlay-injectors/messenger.js            (src/chrome/content/overlay-injectors/messenger.js)
+    content/overlay-injectors/3pane.js                (src/chrome/content/overlay-injectors/3pane.js)
     content/overlay-injectors/customizeToolbar.js     (src/chrome/content/overlay-injectors/customizeToolbar.js)
 *   content/skin/classic/removedupes-messenger.css    (src/chrome/skin/classic/removedupes-messenger.css)
 *   content/skin/classic/removedupes-button.css       (src/chrome/skin/classic/removedupes-button.css)

diff --git a/src/background.js b/src/background.js
@@ -46,6 +46,7 @@
   ]);
 
   messenger.WindowListener.registerWindow("chrome://messenger/content/messenger.xhtml",       "chrome://removedupes/content/overlay-injectors/messenger.js");
+  messenger.WindowListener.registerWindow("about:3pane",       "chrome://removedupes/content/overlay-injectors/3pane.js");
   messenger.WindowListener.registerWindow("chrome://messenger/content/customizeToolbar.xhtml", "chrome://removedupes/content/overlay-injectors/customizeToolbar.js");
   messenger.WindowListener.registerOptionsPage("chrome://removedupes/content/removedupes-prefs.xhtml")
   messenger.WindowListener.startListening();

diff --git a/src/chrome/content/overlay-injectors/3pane.js b/src/chrome/content/overlay-injectors/3pane.js
@@ -0,0 +1,32 @@
+const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
+
+function injectOtherElements() {
+   WL.injectElements(
+    `
+    <popup id="folderPaneContext">
+      <menuitem id="removeDuplicatesContextMenuItemsRemove"
+        insertafter="folderPaneContext-copy-location"
+        label="&removedupes.remove_duplicates_menuitems.remove.label;"
+        oncommand="window.top.RemoveDupes.MessengerOverlay.searchAndRemoveDuplicateMessages();" />
+      <menuitem id="removeDuplicatesContextMenuItemsSetOriginals"
+        insertafter="removeDuplicatesMenuItemsRemove"
+        label="&removedupes.remove_duplicates_menuitems.set_originals.label;"
+        oncommand="window.top.RemoveDupes.MessengerOverlay.setOriginalsFolders();"/>
+      <menuseparator id="folderPaneContext-removedupes-separator"
+        insertafter="removeDuplicatesMenuItemsSetOriginals" />
+    </popup>
+`,
+    [
+      "chrome://removedupes/locale/removedupes.dtd",
+      "chrome://removedupes/locale/removedupes-prefs.dtd",
+    ],
+    false // debugInjection
+  );
+  WL.injectCSS("chrome://removedupes/content/skin/classic/removedupes-messenger.css");
+}
+
+// called on window load or on add-on activation while window is already open
+function onLoad(activatedWhileWindowOpen) {
+  injectOtherElements();
+}
+
diff --git a/src/chrome/content/overlay-injectors/messenger.js b/src/chrome/content/overlay-injectors/messenger.js
@@ -1,7 +1,5 @@
 const Services = globalThis.Services || ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
 
-var debugInjection = false;
-
 Services.scriptloader.loadSubScript("chrome://removedupes/content/removedupes.js", window, "UTF-8");
 
 function injectToolbarButton() {
@@ -71,7 +69,7 @@ function injectToolbarButton() {
       "chrome://removedupes/locale/removedupes.dtd",
       "chrome://removedupes/locale/removedupes-prefs.dtd",
     ],
-    debugInjection
+    false // debugInjection
   );
   WL.injectCSS("chrome://removedupes/content/skin/classic/removedupes-button.css");
 }
@@ -117,7 +115,7 @@ function injectOtherElements() {
       "chrome://removedupes/locale/removedupes.dtd",
       "chrome://removedupes/locale/removedupes-prefs.dtd",
     ],
-    debugInjection
+    false // debugInjection
   );
   WL.injectCSS("chrome://removedupes/content/skin/classic/removedupes-messenger.css");
 }

diff --git a/src/chrome/content/removedupes.js b/src/chrome/content/removedupes.js
@@ -288,7 +288,7 @@ RemoveDupes.MessengerOverlay.processMessagesInCollectedFoldersPhase2 = function
     return;
   }
 
-  window.statusFeedback.stopMeteors();
+  window.statusFeedback?.stopMeteors?.();
   if (ObjectUtils.isEmpty(searchData.dupeSetsHashMap)) {
     if (searchData.useReviewDialog) {
       // if the user wants a dialog to pop up for the dupes,