Support for Thunderbird 68, moving to a bootstrapped extension

.gitignore

@@ -0,0 +1 @@
+web-ext-artifacts

webextension/_locales/de/messages.json → _locales/de/messages.json

@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Ändert die Anzahl der zuletzt verwendeten Ordner, die angezeigt werden wenn kein Suchtext eingegeben wurde."
+  },
+  "noResults": {
+    "message": "<Keine Ergebnisse>"
   }
 }

webextension/_locales/en/messages.json → _locales/en/messages.json

@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Changes the number of recent folders shown when no search text is entered."
+  },
+  "noResults": {
+    "message": "<no results>"
   }
 }

webextension/_locales/ru/messages.json → _locales/ru/messages.json

@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Изменяет количество последних папок, что отображаются, если не введен текст в поле поиска"
+  },
+  "noResults": {
+    "message": "<Результаты отсутствуют>"
   }
 }

webextension/_locales/uk/messages.json → _locales/uk/messages.json

@@ -16,5 +16,8 @@
   },
   "maxRecentFolders.title": {
     "message": "Змінює кількість останніх папок, що відображуються, коли не ввдено жодного тексту в поле пошуку."
+  },
+  "noResults": {
+    "message": "<Результати відсутні>"
   }
 }

bootstrap.js

@@ -0,0 +1,256 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ * Portions Copyright (C) Philipp Kewisch, 2019 */
+
+var { ExtensionSupport } = ChromeUtils.import(
+  "resource:///modules/ExtensionSupport.jsm"
+);
+
+var { Services } = ChromeUtils.import(
+  "resource://gre/modules/Services.jsm"
+);
+
+/* exported startup, shutdown, install, uninstall */
+
+function initScript(window, document) {
+  Services.scriptloader.loadSubScript("chrome://quickmove/content/quickmove.js", window);
+  window.quickmove.cleanup.push(() => {
+    delete window.quickmove;
+  });
+}
+
+function initCSS(window, document) {
+  let link = document.createElementNS(
+    "http://www.w3.org/1999/xhtml",
+    "link"
+  );
+
+  link.setAttribute("id", "quickmove-styles");
+  link.setAttribute("rel", "stylesheet");
+  link.setAttribute("type", "text/css");
+  link.setAttribute("href", "chrome://quickmove/content/quickmove.css");
+
+  document.documentElement.appendChild(link);
+  window.quickmove.cleanup.push(() => {
+    document.getElementById("quickmove-styles").remove();
+  });
+}
+
+function initKeys(window, document) {
+  document.getElementById("mainPopupSet").appendChild(
+    window.MozXULElement.parseXULToFragment(`
+      <menupopup id="quickmove-menupopup"
+             ignorekeys="true"
+             onpopupshowing="quickmove.popupshowing(event)"
+             onpopupshown="quickmove.popupshown(event)"
+             onpopuphidden="quickmove.hide(event.target)"
+             oncommand="quickmove.command(event, quickmove.executeMove)">
+        <html:input class="quickmove-textbox"
+                    onfocus="quickmove.focus(event)"
+                    onkeypress="quickmove.keypress(event, quickmove.executeMove)"
+                    oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+        <menuseparator class="quickmove-separator"/>
+      </menupopup>
+      <menupopup id="quickmove-goto-menupopup"
+                 ignorekeys="true"
+                 onpopupshowing="quickmove.popupshowing(event)"
+                 onpopupshown="quickmove.popupshown(event)"
+                 onpopuphidden="quickmove.hide(event.target)"
+                 oncommand="quickmove.command(event, quickmove.executeGoto)">
+        <html:input class="quickmove-textbox"
+                    onfocus="quickmove.focus(event)"
+                    onkeypress="quickmove.keypress(event, quickmove.executeGoto)"
+                    oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+        <menuseparator id="quickmove-goto-separator" class="quickmove-separator"/>
+      </menupopup>
+      <menupopup id="quickmove-copy-menupopup"
+                 ignorekeys="true"
+                 onpopupshowing="quickmove.popupshowing(event)"
+                 onpopupshown="quickmove.popupshown(event)"
+                 onpopuphidden="quickmove.hide(event.target)"
+                 oncommand="quickmove.command(event, quickmove.executeCopy)">
+        <html:input class="quickmove-textbox"
+                    onfocus="quickmove.focus(event)"
+                    onkeypress="quickmove.keypress(event, quickmove.executeCopy)"
+                    oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+        <menuseparator id="quickmove-copy-separator" class="quickmove-separator"/>
+      </menupopup>
+    `)
+  );
+
+  document.getElementById("mailKeys").appendChild(
+    window.MozXULElement.parseXULToFragment(`
+      <keyset id="quickmove-keyset">
+        <key id="quickmove-file" key="M" modifiers="shift" oncommand="quickmove.openFile()"/>
+        <key id="quickmove-goto" key="G" modifiers="shift" oncommand="quickmove.openGoto()"/>
+        <key id="quickmove-copy" key="Y" modifiers="shift" oncommand="quickmove.openCopy()"/>
+      </keyset>
+    `)
+  );
+
+  window.quickmove.cleanup.push(() => {
+    document.getElementById("quickmove-keyset").remove();
+    document.getElementById("quickmove-menupopup").remove();
+    document.getElementById("quickmove-copy-menupopup").remove();
+    document.getElementById("quickmove-goto-menupopup").remove();
+  });
+}
+
+function initButtonFile(window, document) {
+  let buttonFile = document.getElementById("button-file") ||
+    document.getElementById("mail-toolbox").palette.querySelector("#button-file");
+
+  let buttonFilePopup = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-filebutton-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)">
+      <html:input id="quickmove-filebutton-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeMove)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator id="quickmove-filebutton-separator" class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let menupopup = buttonFile.querySelector("#button-filePopup");
+
+  buttonFilePopup.oldPopup = buttonFile.replaceChild(buttonFilePopup, menupopup);
+
+  window.quickmove.cleanup.push(() => {
+    buttonFile = document.getElementById("button-file") ||
+      document.getElementById("mail-toolbox").palette.querySelector("#button-file");
+
+    let popup = buttonFile.querySelector("#quickmove-filebutton-menupopup");
+    popup.parentNode.replaceChild(popup.oldPopup, popup);
+  });
+}
+
+function initContextMenus(window, document) {
+  let moveMenu = document.getElementById("mailContext-moveMenu");
+  let quickMoveFileHere = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-context-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)"
+               oncommand="quickmove.command(event, quickmove.executeMove, true)">
+      <html:input class="quickmove-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeMove)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let oldMovePopup = moveMenu.replaceChild(quickMoveFileHere, moveMenu.menupopup);
+
+  let copyMenu = document.getElementById("mailContext-copyMenu");
+  let quickMoveCopyHere = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-context-copy-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)"
+               oncommand="quickmove.command(event, quickmove.executeCopy, true)">
+      <html:input class="quickmove-copy-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeCopy)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let oldCopyPopup = copyMenu.replaceChild(quickMoveCopyHere, copyMenu.menupopup);
+
+  window.quickmove.cleanup.push(() => {
+    quickMoveFileHere = document.getElementById("quickmove-context-menupopup");
+    quickMoveFileHere.parentNode.replaceChild(oldMovePopup, quickMoveFileHere);
+
+    quickMoveCopyHere = document.getElementById("quickmove-context-copy-menupopup");
+    quickMoveCopyHere.parentNode.replaceChild(oldCopyPopup, quickMoveCopyHere);
+  });
+}
+
+function initFolderLocation(window, document) {
+  let quickmoveLocationPopup = window.MozXULElement.parseXULToFragment(`
+    <menupopup id="quickmove-folderlocation-menupopup"
+               ignorekeys="true"
+               onpopupshowing="quickmove.popupshowing(event)"
+               onpopupshown="quickmove.popupshown(event)"
+               onpopuphidden="quickmove.hide(event.target)"
+               oncommand="quickmove.command(event, quickmove.executeGoto)">
+      <html:input class="quickmove-textbox"
+                  onfocus="quickmove.focus(event)"
+                  onkeypress="quickmove.keypress(event, quickmove.executeGoto)"
+                  oninput="quickmove.searchDelayed(event.target); event.stopPropagation();"/>
+      <menuseparator id="quickmove-location-separator" class="quickmove-separator"/>
+    </menupopup>
+  `);
+
+  let palette = document.getElementById("mail-toolbox").palette;
+
+  let folderLocationPopup = document.getElementById("folderLocationPopup") ||
+    palette.querySelector("#folderLocationPopup");
+  folderLocationPopup.setAttribute("hidden", "true");
+
+  let locationFolders = document.getElementById("locationFolders") ||
+    palette.querySelector("#locationFolders");
+  locationFolders.appendChild(quickmoveLocationPopup);
+
+  window.quickmove.cleanup.push(() => {
+    folderLocationPopup = document.getElementById("folderLocationPopup") ||
+      palette.querySelector("#folderLocationPopup");
+    folderLocationPopup.removeAttribute("hidden");
+
+    quickmoveLocationPopup = document.getElementById("quickmove-folderlocation-menupopup") ||
+      palette.querySelector("#quickmove-folderlocation-menupopup");
+    quickmoveLocationPopup.remove();
+  });
+}
+
+function startup(data, reason) {
+  ExtensionSupport.registerWindowListener("quickmove", {
+    chromeURLs: [
+      "chrome://messenger/content/messageWindow.xul",
+      "chrome://messenger/content/messenger.xul"
+    ],
+    onLoadWindow: async function(window) {
+      let document = window.document;
+
+      initScript(window, document);
+      initCSS(window, document);
+      initKeys(window, document);
+
+      initButtonFile(window, document);
+      initContextMenus(window, document);
+
+      if (window.location.href == "chrome://messenger/content/messageWindow.xul") {
+        document.getElementById("quickmove-goto").remove();
+      } else if (window.location.href == "chrome://messenger/content/messenger.xul") {
+        initFolderLocation(window, document);
+      }
+    }
+  });
+}
+
+function shutdown() {
+  ExtensionSupport.unregisterWindowListener("quickmove");
+
+  for (let window of ExtensionSupport.openWindows) {
+    if (window.quickmove && window.quickmove.cleanup) {
+      for (let func of window.quickmove.cleanup.reverse()) {
+        try {
+          func();
+        } catch (e) {
+          Cu.reportError(e);
+        }
+      }
+    }
+  }
+}
+
+function install() {}
+function uninstall() {}

chrome.manifest

@@ -1,9 +1 @@
-content	quickmove	        chrome/content/
-locale  quickmove en-US     chrome/locales/en-US/
-locale  quickmove de        chrome/locales/de/
-locale  quickmove uk        chrome/locales/uk/
-locale  quickmove ru        chrome/locales/ru/
-resource quickmove          .
-
-overlay chrome://messenger/content/messenger.xul chrome://quickmove/content/quickmove-overlay.xul
-overlay chrome://messenger/content/messageWindow.xul chrome://quickmove/content/quickmove-overlay.xul
+content quickmove content/