Load in xhtml windows for Thunderbird 72

kewisch · Jan 19, 2020 · cf0e506 · cf0e506
1 parent 4307a1c
commit cf0e506
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/bootstrap.js b/bootstrap.js
@@ -215,7 +215,11 @@ function startup(data, reason) {
   ExtensionSupport.registerWindowListener("quickmove", {
     chromeURLs: [
       "chrome://messenger/content/messageWindow.xul",
-      "chrome://messenger/content/messenger.xul"
+      "chrome://messenger/content/messenger.xul",
+
+      // Thunderbird 72+
+      "chrome://messenger/content/messageWindow.xhtml",
+      "chrome://messenger/content/messenger.xhtml"
     ],
     onLoadWindow: async function(window) {
       let document = window.document;
@@ -227,9 +231,9 @@ function startup(data, reason) {
       initButtonFile(window, document);
       initContextMenus(window, document);
 
-      if (window.location.href == "chrome://messenger/content/messageWindow.xul") {
+      if (window.location.href.startsWith("chrome://messenger/content/messageWindow.")) {
         document.getElementById("quickmove-goto").remove();
-      } else if (window.location.href == "chrome://messenger/content/messenger.xul") {
+      } else if (window.location.href.startsWith("chrome://messenger/content/messenger.")) {
         initFolderLocation(window, document);
       }
     }

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "__MSG_extensionName__",
   "description": "__MSG_extensionDescription__",
-  "version": "1.7.0",
+  "version": "1.7.1",
   "default_locale": "en",
   "author": "Philipp Kewisch",
   "applications": {