From cb2f0f614362d3e986d585d6d1b4a2eaa20a1365 Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Sun, 23 Dec 2018 22:47:45 +0200
Subject: [PALEMOON] Initialize the search service asynchronously from
 'about:home' and 'about:newtab'

---
 application/palemoon/base/content/browser.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 591d00fbb..8a635e91b 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -2456,7 +2456,7 @@ function BrowserOnAboutPageLoad(doc) {
       docElt.setAttribute("searchEnginePostData", engine.postDataString || "");
       docElt.setAttribute("searchEngineURL", engine.searchURL);
     }
-    updateSearchEngine();
+    Services.search.init(updateSearchEngine);
 
     // Listen for the event that's triggered when the user changes search engine.
     // At this point we simply reload about:home to reflect the change.
@@ -2481,7 +2481,7 @@ function BrowserOnAboutPageLoad(doc) {
       docElt.setAttribute("searchEnginePostData", engine.postDataString || "");
       docElt.setAttribute("searchEngineURL", engine.searchURL);
     }
-    updateSearchEngine();
+    Services.search.init(updateSearchEngine);
 
     // Listen for the event that's triggered when the user changes search engine.
     // At this point we simply reload about:newtab to reflect the change.
-- 
cgit v1.2.3


From accd61429eee73dd3564957cf3d6480c280d44e7 Mon Sep 17 00:00:00 2001
From: JustOff <Off.Just.Off@gmail.com>
Date: Wed, 26 Dec 2018 13:48:49 +0200
Subject: [PALEMOON] Initialize the search service asynchronously when calling
 'BrowserSearch.addEngine()'

---
 application/palemoon/base/content/browser.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 8a635e91b..eb4916e37 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -3046,7 +3046,9 @@ const DOMLinkHandler = {
                 /^(?:https?|ftp):/i.test(link.href) &&
                 !PrivateBrowsingUtils.isWindowPrivate(window)) {
               var engine = { title: link.title, href: link.href };
-              BrowserSearch.addEngine(engine, link.ownerDocument);
+              Services.search.init(function () {
+                BrowserSearch.addEngine(engine, link.ownerDocument);
+              });
               searchAdded = true;
             }
           }
-- 
cgit v1.2.3


From 192715be578758ad2dc0cc85f2fba78a9ab747cb Mon Sep 17 00:00:00 2001
From: FranklinDM <mrmineshafter17@gmail.com>
Date: Sat, 2 Feb 2019 14:22:17 +0800
Subject: [Pale Moon] Use mousemove events instead of MousePosTracker for
 hiding the navigation bar in fullscreen * Tag #336

---
 .../palemoon/base/content/browser-fullScreen.js    | 37 ++++++----------------
 1 file changed, 10 insertions(+), 27 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser-fullScreen.js b/application/palemoon/base/content/browser-fullScreen.js
index b1235a8d3..e816ce5c1 100644
--- a/application/palemoon/base/content/browser-fullScreen.js
+++ b/application/palemoon/base/content/browser-fullScreen.js
@@ -53,17 +53,9 @@ var FullScreen = {
       document.addEventListener("popupshown", this._setPopupOpen, false);
       document.addEventListener("popuphidden", this._setPopupOpen, false);
       this._shouldAnimate = true;
-      // If it is not safe to collapse, add the mouse position tracker or
-      // else it won't be possible to hide the navigation toolbox again
-      if (!this._safeToCollapse(document.mozFullScreen)) {
-        let rect = gBrowser.mPanelContainer.getBoundingClientRect();
-        this._mouseTargetRect = {
-          top: rect.top + 50,
-          bottom: rect.bottom,
-          left: rect.left,
-          right: rect.right
-        };
-        MousePosTracker.addListener(this);
+      if (gPrefService.getBoolPref("browser.fullscreen.autohide")) {
+        gBrowser.mPanelContainer.addEventListener("mousemove",
+                                                  this._collapseCallback, false);
       }
       // We don't animate the toolbar collapse if in DOM full-screen mode,
       // as the size of the content area would still be changing after the
@@ -149,7 +141,8 @@ var FullScreen = {
 
   cleanup: function () {
     if (!window.fullScreen) {
-      MousePosTracker.removeListener(this);
+      gBrowser.mPanelContainer.removeEventListener("mousemove",
+                                                   this._collapseCallback, false);
       document.removeEventListener("keypress", this._keyToggleCallback, false);
       document.removeEventListener("popupshown", this._setPopupOpen, false);
       document.removeEventListener("popuphidden", this._setPopupOpen, false);
@@ -164,17 +157,12 @@ var FullScreen = {
     }
   },
 
-  getMouseTargetRect: function()
-  {
-    return this._mouseTargetRect;
-  },
-
   // Event callbacks
   _expandCallback: function()
   {
     FullScreen.showNavToolbox();
   },
-  onMouseEnter: function()
+  _collapseCallback: function()
   {
     FullScreen.hideNavToolbox();
   },
@@ -328,14 +316,8 @@ var FullScreen = {
     // Track whether mouse is near the toolbox
     this._isChromeCollapsed = false;
     if (trackMouse) {
-      let rect = gBrowser.mPanelContainer.getBoundingClientRect();
-      this._mouseTargetRect = {
-        top: rect.top + 50,
-        bottom: rect.bottom,
-        left: rect.left,
-        right: rect.right
-      };
-      MousePosTracker.addListener(this);
+      gBrowser.mPanelContainer.addEventListener("mousemove",
+                                                this._collapseCallback, false);
     }
   },
 
@@ -378,7 +360,8 @@ var FullScreen = {
     gNavToolbox.style.marginTop =
       -gNavToolbox.getBoundingClientRect().height + "px";
     this._isChromeCollapsed = true;
-    MousePosTracker.removeListener(this);
+    gBrowser.mPanelContainer.removeEventListener("mousemove",
+                                                 this._collapseCallback, false);
   },
 
   showXULChrome: function(aTag, aShow)
-- 
cgit v1.2.3


From e057156093c5ff2fbb13110dd62bbca2e52bd6c7 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Tue, 5 Feb 2019 14:09:00 +0100
Subject: Make sure Glass doesn't override LWT style for the title bar.

This resolves #965.
---
 application/palemoon/base/content/browser-title.css | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser-title.css b/application/palemoon/base/content/browser-title.css
index 66b5e6731..5f7e77564 100644
--- a/application/palemoon/base/content/browser-title.css
+++ b/application/palemoon/base/content/browser-title.css
@@ -50,13 +50,6 @@
     right: -12px;
 }
 
-/* Lightweight Themes */
-
-#main-window:-moz-lwtheme::after {
-  color: inherit;
-  text-shadow: inherit;
-}
-
 /* Windows Classic theme */
 
 @media all and (-moz-windows-classic) {
@@ -192,6 +185,13 @@
   
 }
 
+/* Lightweight Themes */
+
+#main-window:-moz-lwtheme::after {
+  color: inherit;
+  text-shadow: inherit;
+}
+
 
 /* Hide for small windows */
 
-- 
cgit v1.2.3


From d9a05498806ede2978623019ce222150c5cfcef5 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 6 Feb 2019 15:59:19 +0100
Subject: Add "check for updates" to main menu and AppMenu

Tag #963.
---
 .../palemoon/base/content/baseMenuOverlay.xul      |  6 ++++++
 .../palemoon/base/content/browser-appmenu.inc      |  5 +++++
 .../palemoon/base/content/utilityOverlay.js        | 23 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul
index e9019dc55..903e93fa2 100644
--- a/application/palemoon/base/content/baseMenuOverlay.xul
+++ b/application/palemoon/base/content/baseMenuOverlay.xul
@@ -67,6 +67,12 @@
                   label="&helpSafeMode.label;"
                   oncommand="restart(true);"/>
         <menuseparator id="aboutSeparator"/>
+#ifdef MOZ_UPDATER
+        <menuitem id="helpCheckForUpdates"
+                  accesskey="&checkForUpdates.accesskey;"
+                  label="&checkForUpdates.label;"
+                  oncommand="checkForUpdates();"/>
+#endif
         <menuitem id="aboutName"
                   accesskey="&aboutProduct.accesskey;"
                   label="&aboutProduct.label;"
diff --git a/application/palemoon/base/content/browser-appmenu.inc b/application/palemoon/base/content/browser-appmenu.inc
index cfc855484..972489b64 100644
--- a/application/palemoon/base/content/browser-appmenu.inc
+++ b/application/palemoon/base/content/browser-appmenu.inc
@@ -359,6 +359,11 @@
                       label="&appMenuSafeMode.label;"
                       oncommand="restart(true);"/>
             <menuseparator/>
+#ifdef MOZ_UPDATER
+            <menuitem id="appmenu_checkForUpdates"
+                      label="&checkForUpdates.label;"
+                      oncommand="checkForUpdates();"/>
+#endif
             <menuitem id="appmenu_about"
                       label="&aboutProduct.label;"
                       oncommand="openAboutDialog();"/>
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js
index 2c1a95f83..a37ce1d3e 100644
--- a/application/palemoon/base/content/utilityOverlay.js
+++ b/application/palemoon/base/content/utilityOverlay.js
@@ -590,6 +590,29 @@ function openAdvancedPreferences(tabID)
   openPreferences("paneAdvanced", { "advancedTab" : tabID });
 }
 
+#ifdef MOZ_UPDATER
+/**
+ * Opens the update manager and checks for updates to the application.
+ */
+function checkForUpdates()
+{
+  var um = 
+      Components.classes["@mozilla.org/updates/update-manager;1"].
+      getService(Components.interfaces.nsIUpdateManager);
+  var prompter = 
+      Components.classes["@mozilla.org/updates/update-prompt;1"].
+      createInstance(Components.interfaces.nsIUpdatePrompt);
+
+  // If there's an update ready to be applied, show the "Update Downloaded"
+  // UI instead and let the user know they have to restart the browser for
+  // the changes to be applied. 
+  if (um.activeUpdate && um.activeUpdate.state == "pending")
+    prompter.showUpdateDownloaded(um.activeUpdate);
+  else
+    prompter.checkForUpdates();
+}
+#endif
+
 /**
  * Opens the troubleshooting information (about:support) page for this version
  * of the application.
-- 
cgit v1.2.3


From 8db772d2ca44ff44f32d434e7f62acba289b4155 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 6 Feb 2019 16:15:27 +0100
Subject: Revert "Add "check for updates" to main menu and AppMenu"

This reverts commit d9a05498806ede2978623019ce222150c5cfcef5.
---
 .../palemoon/base/content/baseMenuOverlay.xul      |  6 ------
 .../palemoon/base/content/browser-appmenu.inc      |  5 -----
 .../palemoon/base/content/utilityOverlay.js        | 23 ----------------------
 3 files changed, 34 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul
index 903e93fa2..e9019dc55 100644
--- a/application/palemoon/base/content/baseMenuOverlay.xul
+++ b/application/palemoon/base/content/baseMenuOverlay.xul
@@ -67,12 +67,6 @@
                   label="&helpSafeMode.label;"
                   oncommand="restart(true);"/>
         <menuseparator id="aboutSeparator"/>
-#ifdef MOZ_UPDATER
-        <menuitem id="helpCheckForUpdates"
-                  accesskey="&checkForUpdates.accesskey;"
-                  label="&checkForUpdates.label;"
-                  oncommand="checkForUpdates();"/>
-#endif
         <menuitem id="aboutName"
                   accesskey="&aboutProduct.accesskey;"
                   label="&aboutProduct.label;"
diff --git a/application/palemoon/base/content/browser-appmenu.inc b/application/palemoon/base/content/browser-appmenu.inc
index 972489b64..cfc855484 100644
--- a/application/palemoon/base/content/browser-appmenu.inc
+++ b/application/palemoon/base/content/browser-appmenu.inc
@@ -359,11 +359,6 @@
                       label="&appMenuSafeMode.label;"
                       oncommand="restart(true);"/>
             <menuseparator/>
-#ifdef MOZ_UPDATER
-            <menuitem id="appmenu_checkForUpdates"
-                      label="&checkForUpdates.label;"
-                      oncommand="checkForUpdates();"/>
-#endif
             <menuitem id="appmenu_about"
                       label="&aboutProduct.label;"
                       oncommand="openAboutDialog();"/>
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js
index a37ce1d3e..2c1a95f83 100644
--- a/application/palemoon/base/content/utilityOverlay.js
+++ b/application/palemoon/base/content/utilityOverlay.js
@@ -590,29 +590,6 @@ function openAdvancedPreferences(tabID)
   openPreferences("paneAdvanced", { "advancedTab" : tabID });
 }
 
-#ifdef MOZ_UPDATER
-/**
- * Opens the update manager and checks for updates to the application.
- */
-function checkForUpdates()
-{
-  var um = 
-      Components.classes["@mozilla.org/updates/update-manager;1"].
-      getService(Components.interfaces.nsIUpdateManager);
-  var prompter = 
-      Components.classes["@mozilla.org/updates/update-prompt;1"].
-      createInstance(Components.interfaces.nsIUpdatePrompt);
-
-  // If there's an update ready to be applied, show the "Update Downloaded"
-  // UI instead and let the user know they have to restart the browser for
-  // the changes to be applied. 
-  if (um.activeUpdate && um.activeUpdate.state == "pending")
-    prompter.showUpdateDownloaded(um.activeUpdate);
-  else
-    prompter.checkForUpdates();
-}
-#endif
-
 /**
  * Opens the troubleshooting information (about:support) page for this version
  * of the application.
-- 
cgit v1.2.3


From 8906ccd05ee2d59e85cc6262c775b924ff0347ae Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Sat, 9 Feb 2019 14:05:34 -0500
Subject: Pale Moon: Add loop context menu to HTML5 media elements.

---
 application/palemoon/base/content/browser-context.inc | 5 +++++
 application/palemoon/base/content/nsContextMenu.js    | 5 +++++
 2 files changed, 10 insertions(+)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser-context.inc b/application/palemoon/base/content/browser-context.inc
index f672ede61..8ef376999 100644
--- a/application/palemoon/base/content/browser-context.inc
+++ b/application/palemoon/base/content/browser-context.inc
@@ -99,6 +99,11 @@
                     oncommand="gContextMenu.mediaCommand('playbackRate', 2.0);"/>
         </menupopup>
       </menu>
+      <menuitem id="context-media-loop"
+                label="&mediaLoop.label;"
+                accesskey="&mediaLoop.accesskey;"
+                type="checkbox"
+                oncommand="gContextMenu.mediaCommand('loop');"/>
       <menuitem id="context-media-showcontrols"
                 label="&mediaShowControls.label;"
                 accesskey="&mediaShowControls.accesskey;"
diff --git a/application/palemoon/base/content/nsContextMenu.js b/application/palemoon/base/content/nsContextMenu.js
index 1d4f88816..916dd2637 100644
--- a/application/palemoon/base/content/nsContextMenu.js
+++ b/application/palemoon/base/content/nsContextMenu.js
@@ -381,6 +381,7 @@ nsContextMenu.prototype = {
     this.showItem("context-media-mute",   onMedia && !this.target.muted);
     this.showItem("context-media-unmute", onMedia && this.target.muted);
     this.showItem("context-media-playbackrate", onMedia);
+    this.showItem("context-media-loop", onMedia);
     this.showItem("context-media-showcontrols", onMedia && !this.target.controls);
     this.showItem("context-media-hidecontrols", onMedia && this.target.controls);
     this.showItem("context-video-fullscreen", this.onVideo && this.target.ownerDocument.mozFullScreenElement == null);
@@ -394,6 +395,7 @@ nsContextMenu.prototype = {
       this.setItemAttr("context-media-playbackrate-100x", "checked", this.target.playbackRate == 1.0);
       this.setItemAttr("context-media-playbackrate-150x", "checked", this.target.playbackRate == 1.5);
       this.setItemAttr("context-media-playbackrate-200x", "checked", this.target.playbackRate == 2.0);
+      this.setItemAttr("context-media-loop", "checked", this.target.loop);
       var hasError = this.target.error != null ||
                      this.target.networkState == this.target.NETWORK_NO_SOURCE;
       this.setItemAttr("context-media-play",  "disabled", hasError);
@@ -1531,6 +1533,9 @@ nsContextMenu.prototype = {
       case "pause":
         media.pause();
         break;
+      case "loop":
+        media.loop = !media.loop;
+        break;
       case "mute":
         media.muted = true;
         break;
-- 
cgit v1.2.3


From 4a89b18b31f6b5a2d358466e47a1159fa6d785fb Mon Sep 17 00:00:00 2001
From: Ascrod <32915892+Ascrod@users.noreply.github.com>
Date: Sun, 10 Feb 2019 11:24:27 -0500
Subject: Rename mediaPlaybackRate to mediaPlaybackRate2.

---
 application/palemoon/base/content/browser-context.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser-context.inc b/application/palemoon/base/content/browser-context.inc
index 8ef376999..38c472508 100644
--- a/application/palemoon/base/content/browser-context.inc
+++ b/application/palemoon/base/content/browser-context.inc
@@ -70,7 +70,7 @@
                 label="&mediaUnmute.label;"
                 accesskey="&mediaUnmute.accesskey;"
                 oncommand="gContextMenu.mediaCommand('unmute');"/>
-      <menu id="context-media-playbackrate" label="&mediaPlaybackRate.label;" accesskey="&mediaPlaybackRate.accesskey;">
+      <menu id="context-media-playbackrate" label="&mediaPlaybackRate2.label;" accesskey="&mediaPlaybackRate2.accesskey;">
         <menupopup>
           <menuitem id="context-media-playbackrate-050x"
                     label="&mediaPlaybackRate050x.label;"
-- 
cgit v1.2.3


From dd418226c6a91301002134f699117ba00f1e0804 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Tue, 12 Feb 2019 16:13:57 +0100
Subject: Add "check for updates" to main menu and AppMenu v2

Tag #963.
---
 .../palemoon/base/content/baseMenuOverlay.xul      |  10 +-
 .../palemoon/base/content/browser-appmenu.inc      |   9 +-
 .../palemoon/base/content/utilityOverlay.js        | 111 +++++++++++++++++++++
 3 files changed, 128 insertions(+), 2 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul
index e9019dc55..d7c983671 100644
--- a/application/palemoon/base/content/baseMenuOverlay.xul
+++ b/application/palemoon/base/content/baseMenuOverlay.xul
@@ -41,7 +41,7 @@
           label="&helpMenu.label;"
           accesskey="&helpMenu.accesskey;">
 #endif
-      <menupopup id="menu_HelpPopup">
+      <menupopup id="menu_HelpPopup" onpopupshowing="buildHelpMenu();">
         <menuitem id="menu_openHelp"
                   oncommand="openHelpLink('firefox-help')"
                   onclick="checkForMiddleClick(this, event);"
@@ -66,6 +66,14 @@
                   accesskey="&helpSafeMode.accesskey;"
                   label="&helpSafeMode.label;"
                   oncommand="restart(true);"/>
+        <menuseparator id="updateSeparator"/>
+        <menuitem id="checkForUpdates" class="menuitem-iconic"
+#ifdef MOZ_UPDATER
+                  label="&updateCmd.label;"
+                  oncommand="checkForUpdates();"/>
+#else
+                  hidden="true"/>
+#endif
         <menuseparator id="aboutSeparator"/>
         <menuitem id="aboutName"
                   accesskey="&aboutProduct.accesskey;"
diff --git a/application/palemoon/base/content/browser-appmenu.inc b/application/palemoon/base/content/browser-appmenu.inc
index cfc855484..ffb117a60 100644
--- a/application/palemoon/base/content/browser-appmenu.inc
+++ b/application/palemoon/base/content/browser-appmenu.inc
@@ -341,7 +341,7 @@
       <splitmenu id="appmenu_help"
                  label="&helpMenu.label;"
                  oncommand="openHelpLink('firefox-help')">
-          <menupopup id="appmenu_helpMenupopup">
+          <menupopup id="appmenu_helpMenupopup" onpopupshowing="buildHelpMenu();">
             <menuitem id="appmenu_openHelp"
                       label="&helpMenu.label;"
                       oncommand="openHelpLink('firefox-help')"
@@ -358,6 +358,13 @@
             <menuitem id="appmenu_safeMode"
                       label="&appMenuSafeMode.label;"
                       oncommand="restart(true);"/>
+#ifdef MOZ_UPDATER
+            <menuseparator/>
+            <menuitem id="appmenu_checkForUpdates"
+                      class="menuitem-iconic"
+                      label="&updateCmd.label;"
+                      oncommand="checkForUpdates();"/>
+#endif
             <menuseparator/>
             <menuitem id="appmenu_about"
                       label="&aboutProduct.label;"
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js
index 2c1a95f83..fe148ad04 100644
--- a/application/palemoon/base/content/utilityOverlay.js
+++ b/application/palemoon/base/content/utilityOverlay.js
@@ -541,6 +541,117 @@ function isBidiEnabled() {
   return rv;
 }
 
+#ifdef MOZ_UPDATER
+/**
+ * Opens the update manager and checks for updates to the application.
+ */
+function checkForUpdates()
+{
+  var um =
+      Components.classes["@mozilla.org/updates/update-manager;1"].
+      getService(Components.interfaces.nsIUpdateManager);
+  var prompter =
+      Components.classes["@mozilla.org/updates/update-prompt;1"].
+      createInstance(Components.interfaces.nsIUpdatePrompt);
+
+  // If there's an update ready to be applied, show the "Update Downloaded"
+  // UI instead and let the user know they have to restart the application for
+  // the changes to be applied.
+  if (um.activeUpdate && um.activeUpdate.state == "pending")
+    prompter.showUpdateDownloaded(um.activeUpdate);
+  else
+    prompter.checkForUpdates();
+}
+#endif
+
+/**
+ * Set up the help menu software update items to show proper status,
+ * also disabling the items if update is disabled.
+ */
+function buildHelpMenu()
+{
+#ifdef MOZ_UPDATER
+  var updates =
+      Components.classes["@mozilla.org/updates/update-service;1"].
+      getService(Components.interfaces.nsIApplicationUpdateService);
+  var um =
+      Components.classes["@mozilla.org/updates/update-manager;1"].
+      getService(Components.interfaces.nsIUpdateManager);
+
+  // Disable the UI if the update enabled pref has been locked by the
+  // administrator or if we cannot update for some other reason.
+  var checkForUpdates = document.getElementById("checkForUpdates");
+  var appMenuCheckForUpdates = document.getElementById("appmenu_checkForUpdates");
+  var canCheckForUpdates = updates.canCheckForUpdates;
+  checkForUpdates.setAttribute("disabled", !canCheckForUpdates);
+  appMenuCheckForUpdates.setAttribute("disabled", !canCheckForUpdates);
+  if (!canCheckForUpdates)
+    return;
+
+  var strings = document.getElementById("bundle_browser");
+  var activeUpdate = um.activeUpdate;
+
+  // If there's an active update, substitute its name into the label
+  // we show for this item, otherwise display a generic label.
+  function getStringWithUpdateName(key) {
+    if (activeUpdate && activeUpdate.name)
+      return strings.getFormattedString(key, [activeUpdate.name]);
+    return strings.getString(key + "Fallback");
+  }
+
+  // By default, show "Check for Updates..." from updatesItem_default or
+  // updatesItem_defaultFallback
+  var key = "default";
+  if (activeUpdate) {
+    switch (activeUpdate.state) {
+    case "downloading":
+      // If we're downloading an update at present, show the text:
+      // "Downloading Thunderbird x.x..." from updatesItem_downloading or
+      // updatesItem_downloadingFallback, otherwise we're paused, and show
+      // "Resume Downloading Thunderbird x.x..." from updatesItem_resume or
+      // updatesItem_resumeFallback
+      key = updates.isDownloading ? "downloading" : "resume";
+      break;
+    case "pending":
+      // If we're waiting for the user to restart, show: "Apply Downloaded
+      // Updates Now..." from updatesItem_pending or
+      // updatesItem_pendingFallback
+      key = "pending";
+      break;
+    }
+  }
+
+  checkForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
+  appMenuCheckForUpdates.label = getStringWithUpdateName("updatesItem_" + key);
+  // updatesItem_default.accesskey, updatesItem_downloading.accesskey,
+  // updatesItem_resume.accesskey or updatesItem_pending.accesskey
+  checkForUpdates.accessKey = strings.getString("updatesItem_" + key +
+                                                ".accesskey");
+  appMenuCheckForUpdates.accessKey = strings.getString("updatesItem_" + key +
+                                                       ".accesskey");
+  if (um.activeUpdate && updates.isDownloading) {
+    checkForUpdates.setAttribute("loading", "true");
+    appMenuCheckForUpdates.setAttribute("loading", "true");  
+  } else {
+    checkForUpdates.removeAttribute("loading");
+    appMenuCheckForUpdates.removeAttribute("loading");
+  }
+#else
+#ifndef XP_MACOSX
+  // Some extensions may rely on these being present so only hide the about
+  // separator when there are no elements besides the check for updates menuitem
+  // in between the about separator and the updates separator.
+  var updatesSeparator = document.getElementById("updatesSeparator");
+  var aboutSeparator = document.getElementById("aboutSeparator");
+  var checkForUpdates = document.getElementById("checkForUpdates");
+  if (updatesSeparator.nextSibling === checkForUpdates &&
+      checkForUpdates.nextSibling === aboutSeparator)
+    updatesSeparator.hidden = true;
+#endif
+#endif
+}
+
+
 function openAboutDialog() {
   var enumerator = Services.wm.getEnumerator("Browser:About");
   while (enumerator.hasMoreElements()) {
-- 
cgit v1.2.3


From cb959aec3a5c62de58067d5e2fe7333e1aac4d1e Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 13 Feb 2019 09:23:25 +0100
Subject: Treat aContext as a bitfield in openURI.

Potential fix for #971
---
 application/palemoon/base/content/browser.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index eb4916e37..3feeef9b6 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -4408,7 +4408,13 @@ nsBrowserAccess.prototype = {
 
   openURI: function (aURI, aOpener, aWhere, aContext) {
     var newWindow = null;
-    var isExternal = (aContext == Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL);
+    var isExternal = !!(aContext & Ci.nsIBrowserDOMWindow.OPEN_EXTERNAL);
+
+    if (aOpener && isExternal) {
+      Cu.reportError("nsBrowserAccess.openURI did not expect an opener to be " +
+                     "passed if the context is OPEN_EXTERNAL.");
+      throw Cr.NS_ERROR_FAILURE;
+    }
 
     if (isExternal && aURI && aURI.schemeIs("chrome")) {
       dump("use -chrome command-line option to load external chrome urls\n");
-- 
cgit v1.2.3


From c962e2051a1f3767a221254487bcfc6d53aa59a1 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Thu, 28 Feb 2019 10:02:19 +0100
Subject: WIP fix 1

---
 application/palemoon/base/content/browser.js         | 5 +++++
 application/palemoon/base/content/tabbrowser.xml     | 5 ++++-
 application/palemoon/base/content/urlbarBindings.xml | 4 ++++
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 3feeef9b6..4e753d422 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -2661,6 +2661,11 @@ function getWebNavigation()
 }
 
 function BrowserReloadWithFlags(reloadFlags) {
+  
+  // Reset DOS mitigation for auth prompts when user initiates a reload.
+  let browser = gBrowser.selectedBrowser;
+  delete browser.authPromptCounter;
+  
   /* First, we'll try to use the session history object to reload so
    * that framesets are handled properly. If we're in a special
    * window (such as view-source) that has no session history, fall
diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index 988cae55c..c3b4872db 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -2458,7 +2458,10 @@
         <parameter name="aTab"/>
         <body>
           <![CDATA[
-            this.getBrowserForTab(aTab).reload();
+            let browser = this.getBrowserForTab(aTab);
+            // Reset DOS mitigation for basic auth prompt
+            delete browser.authPromptCounter;
+            browser.reload();
           ]]>
         </body>
       </method>
diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index d188e6658..d2d9cc720 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -302,6 +302,10 @@
               // but don't let that interfere with the loading of the url.
               Cu.reportError(ex);
             }
+            
+            // Reset DOS mitigations for the basic auth prompt.
+            let browser = gBrowser.selectedBrowser;
+            delete browser.authPromptCounter;
 
             function loadCurrent() {
               let flags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
-- 
cgit v1.2.3


From c1ece93c2be6fb571a013f9735dc629d7279f389 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Fri, 1 Mar 2019 14:01:09 +0100
Subject: Make the Auth prompt DOS protection a browser-element opt-in feature.

---
 application/palemoon/base/content/browser.xul    | 3 ++-
 application/palemoon/base/content/tabbrowser.xml | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul
index ce2a7c5a8..ddc305a7b 100644
--- a/application/palemoon/base/content/browser.xul
+++ b/application/palemoon/base/content/browser.xul
@@ -965,7 +965,8 @@
                   tabcontainer="tabbrowser-tabs"
                   contentcontextmenu="contentAreaContextMenu"
                   autocompletepopup="PopupAutoComplete"
-                  datetimepicker="DateTimePickerPanel"/>
+                  datetimepicker="DateTimePickerPanel"
+                  authdosprotected="true"/>
       <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
       <statuspanel id="statusbar-display" inactive="true"/>
     </vbox>
diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index c3b4872db..cbe029af0 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -30,7 +30,7 @@
               <xul:vbox flex="1" class="browserContainer">
                 <xul:stack flex="1" class="browserStack" anonid="browserStack">
                   <xul:browser anonid="initialBrowser" type="content-primary" message="true" disablehistory="true"
-                               xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu,autocompletepopup,datetimepicker"/>
+                               xbl:inherits="tooltip=contenttooltip,contextmenu=contentcontextmenu,autocompletepopup,datetimepicker,authdosprotected"/>
                 </xul:stack>
               </xul:vbox>
             </xul:hbox>
@@ -1588,6 +1588,10 @@
             if (this.hasAttribute("datetimepicker")) {
               b.setAttribute("datetimepicker", this.getAttribute("datetimepicker"));
             }
+            
+            if (this.hasAttribute("authdosprotected")) {
+              b.setAttribute("authdosprotected", this.getAttribute("authdosprotected"));
+            }
 
             // Create the browserStack container
             var stack = document.createElementNS(NS_XUL, "stack");
-- 
cgit v1.2.3


From a61164a88d485c701ba7037bf5f54bba1a6c88f3 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Mon, 4 Mar 2019 13:00:44 +0100
Subject: Remove updater gunk from the about box.

---
 application/palemoon/base/content/aboutDialog.css |  12 -
 application/palemoon/base/content/aboutDialog.js  | 528 ----------------------
 application/palemoon/base/content/aboutDialog.xul |  38 --
 3 files changed, 578 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/aboutDialog.css b/application/palemoon/base/content/aboutDialog.css
index d171a0bc1..b82c7fdc3 100644
--- a/application/palemoon/base/content/aboutDialog.css
+++ b/application/palemoon/base/content/aboutDialog.css
@@ -41,18 +41,6 @@
   -moz-padding-start: 0;
 }
 
-#updateButton,
-#updateDeck > hbox > label {
-  -moz-margin-start: 0;
-  -moz-padding-start: 0;
-}
-
-.update-throbber {
-  width: 16px;
-  min-height: 16px;
-  -moz-margin-end: 3px;
-  list-style-image: url("chrome://global/skin/icons/loading_16.png");
-}
 
 .text-link,
 .text-link:focus {
diff --git a/application/palemoon/base/content/aboutDialog.js b/application/palemoon/base/content/aboutDialog.js
index f4c2a990c..980c64259 100644
--- a/application/palemoon/base/content/aboutDialog.js
+++ b/application/palemoon/base/content/aboutDialog.js
@@ -45,10 +45,6 @@ function init(aEvent)
     document.getElementById("PMversion").textContent += " (" + buildDate + ")";
   }
 
-#ifdef MOZ_UPDATER
-  gAppUpdater = new appUpdater();
-#endif
-
 #ifdef XP_MACOSX
   // it may not be sized at this point, and we need its width to calculate its position
   window.sizeToContent();
@@ -64,527 +60,3 @@ function init(aEvent)
     relnotes.setAttribute("href", releaseNotesURL);
   }
 }
-
-#ifdef MOZ_UPDATER
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/DownloadUtils.jsm");
-Components.utils.import("resource://gre/modules/AddonManager.jsm");
-
-var gAppUpdater;
-
-function onUnload(aEvent) {
-  if (gAppUpdater.isChecking)
-    gAppUpdater.checker.stopChecking(Components.interfaces.nsIUpdateChecker.CURRENT_CHECK);
-  // Safe to call even when there isn't a download in progress.
-  gAppUpdater.removeDownloadListener();
-  gAppUpdater = null;
-}
-
-
-function appUpdater()
-{
-  this.updateDeck = document.getElementById("updateDeck");
-
-  // Hide the update deck when there is already an update window open to avoid
-  // syncing issues between them.
-  if (Services.wm.getMostRecentWindow("Update:Wizard")) {
-    this.updateDeck.hidden = true;
-    return;
-  }
-
-  XPCOMUtils.defineLazyServiceGetter(this, "aus",
-                                     "@mozilla.org/updates/update-service;1",
-                                     "nsIApplicationUpdateService");
-  XPCOMUtils.defineLazyServiceGetter(this, "checker",
-                                     "@mozilla.org/updates/update-checker;1",
-                                     "nsIUpdateChecker");
-  XPCOMUtils.defineLazyServiceGetter(this, "um",
-                                     "@mozilla.org/updates/update-manager;1",
-                                     "nsIUpdateManager");
-
-  this.bundle = Services.strings.
-                createBundle("chrome://browser/locale/browser.properties");
-
-  this.updateBtn = document.getElementById("updateButton");
-
-  // The button label value must be set so its height is correct.
-  this.setupUpdateButton("update.checkInsideButton");
-
-  let manualURL = Services.urlFormatter.formatURLPref("app.update.url.manual");
-  let manualLink = document.getElementById("manualLink");
-  manualLink.value = manualURL;
-  manualLink.href = manualURL;
-  document.getElementById("failedLink").href = manualURL;
-
-  if (this.updateDisabledAndLocked) {
-    this.selectPanel("adminDisabled");
-    return;
-  }
-
-  if (this.isPending || this.isApplied) {
-    this.setupUpdateButton("update.restart." +
-                           (this.isMajor ? "upgradeButton" : "updateButton"));
-    return;
-  }
-
-  if (this.aus.isOtherInstanceHandlingUpdates) {
-    this.selectPanel("otherInstanceHandlingUpdates");
-    return;
-  }
-
-  if (this.isDownloading) {
-    this.startDownload();
-    return;
-  }
-
-  if (this.updateEnabled && this.updateAuto) {
-    this.selectPanel("checkingForUpdates");
-    this.isChecking = true;
-    this.checker.checkForUpdates(this.updateCheckListener, true);
-    return;
-  }
-}
-
-appUpdater.prototype =
-{
-  // true when there is an update check in progress.
-  isChecking: false,
-
-  // true when there is an update already staged / ready to be applied.
-  get isPending() {
-    if (this.update) {
-      return this.update.state == "pending" ||
-             this.update.state == "pending-service";
-    }
-    return this.um.activeUpdate &&
-           (this.um.activeUpdate.state == "pending" ||
-            this.um.activeUpdate.state == "pending-service");
-  },
-
-  // true when there is an update already installed in the background.
-  get isApplied() {
-    if (this.update)
-      return this.update.state == "applied" ||
-             this.update.state == "applied-service";
-    return this.um.activeUpdate &&
-           (this.um.activeUpdate.state == "applied" ||
-            this.um.activeUpdate.state == "applied-service");
-  },
-
-  // true when there is an update download in progress.
-  get isDownloading() {
-    if (this.update)
-      return this.update.state == "downloading";
-    return this.um.activeUpdate &&
-           this.um.activeUpdate.state == "downloading";
-  },
-
-  // true when the update type is major.
-  get isMajor() {
-    if (this.update)
-      return this.update.type == "major";
-    return this.um.activeUpdate.type == "major";
-  },
-
-  // true when updating is disabled by an administrator.
-  get updateDisabledAndLocked() {
-    return !this.updateEnabled &&
-           Services.prefs.prefIsLocked("app.update.enabled");
-  },
-
-  // true when updating is enabled.
-  get updateEnabled() {
-    try {
-      return Services.prefs.getBoolPref("app.update.enabled");
-    }
-    catch (e) { }
-    return true; // Firefox default is true
-  },
-
-  // true when updating in background is enabled.
-  get backgroundUpdateEnabled() {
-    return this.updateEnabled &&
-           gAppUpdater.aus.canStageUpdates;
-  },
-
-  // true when updating is automatic.
-  get updateAuto() {
-    try {
-      return Services.prefs.getBoolPref("app.update.auto");
-    }
-    catch (e) { }
-    return true; // Firefox default is true
-  },
-
-  /**
-   * Sets the deck's selected panel.
-   *
-   * @param  aChildID
-   *         The id of the deck's child to select.
-   */
-  selectPanel: function(aChildID) {
-    this.updateDeck.selectedPanel = document.getElementById(aChildID);
-    this.updateBtn.disabled = (aChildID != "updateButtonBox");
-  },
-
-  /**
-   * Sets the update button's label and accesskey.
-   *
-   * @param  aKeyPrefix
-   *         The prefix for the properties file entry to use for setting the
-   *         label and accesskey.
-   */
-  setupUpdateButton: function(aKeyPrefix) {
-    this.updateBtn.label = this.bundle.GetStringFromName(aKeyPrefix + ".label");
-    this.updateBtn.accessKey = this.bundle.GetStringFromName(aKeyPrefix + ".accesskey");
-    if (!document.commandDispatcher.focusedElement ||
-        document.commandDispatcher.focusedElement == this.updateBtn)
-      this.updateBtn.focus();
-  },
-
-  /**
-   * Handles oncommand for the update button.
-   */
-  buttonOnCommand: function() {
-    if (this.isPending || this.isApplied) {
-      // Notify all windows that an application quit has been requested.
-      let cancelQuit = Components.classes["@mozilla.org/supports-PRBool;1"].
-                       createInstance(Components.interfaces.nsISupportsPRBool);
-      Services.obs.notifyObservers(cancelQuit, "quit-application-requested", "restart");
-
-      // Something aborted the quit process.
-      if (cancelQuit.data)
-        return;
-
-      let appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"].
-                       getService(Components.interfaces.nsIAppStartup);
-
-      // If already in safe mode restart in safe mode (bug 327119)
-      if (Services.appinfo.inSafeMode) {
-        appStartup.restartInSafeMode(Components.interfaces.nsIAppStartup.eAttemptQuit);
-        return;
-      }
-
-      appStartup.quit(Components.interfaces.nsIAppStartup.eAttemptQuit |
-                      Components.interfaces.nsIAppStartup.eRestart);
-      return;
-    }
-
-    const URI_UPDATE_PROMPT_DIALOG = "chrome://mozapps/content/update/updates.xul";
-    // Firefox no longer displays a license for updates and the licenseURL check
-    // is just in case a distibution does.
-    if (this.update) {
-      var ary = null;
-      ary = Components.classes["@mozilla.org/supports-array;1"].
-            createInstance(Components.interfaces.nsISupportsArray);
-      ary.AppendElement(this.update);
-      var openFeatures = "chrome,centerscreen,dialog=no,resizable=no,titlebar,toolbar=no";
-      Services.ww.openWindow(null, URI_UPDATE_PROMPT_DIALOG, "", openFeatures, ary);
-      window.close();
-      return;
-    }
-
-    this.selectPanel("checkingForUpdates");
-    this.isChecking = true;
-    this.checker.checkForUpdates(this.updateCheckListener, true);
-  },
-
-  /**
-   * Implements nsIUpdateCheckListener. The methods implemented by
-   * nsIUpdateCheckListener are in a different scope from nsIIncrementalDownload
-   * to make it clear which are used by each interface.
-   */
-  updateCheckListener: {
-    /**
-     * See nsIUpdateService.idl
-     */
-    onCheckComplete: function(aRequest, aUpdates, aUpdateCount) {
-      gAppUpdater.isChecking = false;
-      gAppUpdater.update = gAppUpdater.aus.
-                           selectUpdate(aUpdates, aUpdates.length);
-      if (!gAppUpdater.update) {
-        gAppUpdater.selectPanel("noUpdatesFound");
-        return;
-      }
-
-      if (gAppUpdater.update.unsupported) {
-        if (gAppUpdater.update.detailsURL) {
-          let unsupportedLink = document.getElementById("unsupportedLink");
-          unsupportedLink.href = gAppUpdater.update.detailsURL;
-        }
-        gAppUpdater.selectPanel("unsupportedSystem");
-        return;
-      }
-
-      if (!gAppUpdater.aus.canApplyUpdates) {
-        gAppUpdater.selectPanel("manualUpdate");
-        return;
-      }
-
-      gAppUpdater.selectPanel("updateButtonBox");
-      gAppUpdater.setupUpdateButton("update.openUpdateUI." +
-                                    (this.isMajor ? "upgradeButton"
-                                                  : "applyButton"));
-    },
-
-    /**
-     * See nsIUpdateService.idl
-     */
-    onError: function(aRequest, aUpdate) {
-      // Errors in the update check are treated as no updates found. If the
-      // update check fails repeatedly without a success the user will be
-      // notified with the normal app update user interface so this is safe.
-      gAppUpdater.isChecking = false;
-      gAppUpdater.selectPanel("noUpdatesFound");
-    },
-
-    /**
-     * See nsISupports.idl
-     */
-    QueryInterface: function(aIID) {
-      if (!aIID.equals(Components.interfaces.nsIUpdateCheckListener) &&
-          !aIID.equals(Components.interfaces.nsISupports))
-        throw Components.results.NS_ERROR_NO_INTERFACE;
-      return this;
-    }
-  },
-
-  /**
-   * Checks the compatibility of add-ons for the application update.
-   */
-  checkAddonCompatibility: function() {
-    var self = this;
-    AddonManager.getAllAddons(function(aAddons) {
-      self.addons = [];
-      self.addonsCheckedCount = 0;
-      aAddons.forEach(function(aAddon) {
-        // Protect against code that overrides the add-ons manager and doesn't
-        // implement the isCompatibleWith or the findUpdates method.
-        if (!("isCompatibleWith" in aAddon) || !("findUpdates" in aAddon)) {
-          let errMsg = "Add-on doesn't implement either the isCompatibleWith " +
-                       "or the findUpdates method!";
-          if (aAddon.id)
-            errMsg += " Add-on ID: " + aAddon.id;
-          Components.utils.reportError(errMsg);
-          return;
-        }
-
-        // If an add-on isn't appDisabled and isn't userDisabled then it is
-        // either active now or the user expects it to be active after the
-        // restart. If that is the case and the add-on is not installed by the
-        // application and is not compatible with the new application version
-        // then the user should be warned that the add-on will become
-        // incompatible. If an addon's type equals plugin it is skipped since
-        // checking plugins compatibility information isn't supported and
-        // getting the scope property of a plugin breaks in some environments
-        // (see bug 566787).
-        try {
-          if (aAddon.type != "plugin" && aAddon.isCompatible &&
-              !aAddon.appDisabled && !aAddon.userDisabled &&
-              aAddon.scope != AddonManager.SCOPE_APPLICATION &&
-              !aAddon.isCompatibleWith(self.update.appVersion,
-                                       self.update.platformVersion))
-            self.addons.push(aAddon);
-        }
-        catch (e) {
-          Components.utils.reportError(e);
-        }
-      });
-      self.addonsTotalCount = self.addons.length;
-      if (self.addonsTotalCount == 0) {
-        self.startDownload();
-        return;
-      }
-
-      self.checkAddonsForUpdates();
-    });
-  },
-
-  /**
-   * Checks if there are updates for add-ons that are incompatible with the
-   * application update.
-   */
-  checkAddonsForUpdates: function() {
-    this.addons.forEach(function(aAddon) {
-      aAddon.findUpdates(this, AddonManager.UPDATE_WHEN_NEW_APP_DETECTED,
-                         this.update.appVersion,
-                         this.update.platformVersion);
-    }, this);
-  },
-
-  /**
-   * See XPIProvider.jsm
-   */
-  onCompatibilityUpdateAvailable: function(aAddon) {
-    for (var i = 0; i < this.addons.length; ++i) {
-      if (this.addons[i].id == aAddon.id) {
-        this.addons.splice(i, 1);
-        break;
-      }
-    }
-  },
-
-  /**
-   * See XPIProvider.jsm
-   */
-  onUpdateAvailable: function(aAddon, aInstall) {
-    if (!Services.blocklist.isAddonBlocklisted(aAddon.id, aInstall.version,
-                                               this.update.appVersion,
-                                               this.update.platformVersion)) {
-      // Compatibility or new version updates mean the same thing here.
-      this.onCompatibilityUpdateAvailable(aAddon);
-    }
-  },
-
-  /**
-   * See XPIProvider.jsm
-   */
-  onUpdateFinished: function(aAddon) {
-    ++this.addonsCheckedCount;
-
-    if (this.addonsCheckedCount < this.addonsTotalCount)
-      return;
-
-    if (this.addons.length == 0) {
-      // Compatibility updates or new version updates were found for all add-ons
-      this.startDownload();
-      return;
-    }
-
-    this.selectPanel("updateButtonBox");
-    this.setupUpdateButton("update.openUpdateUI." +
-                           (this.isMajor ? "upgradeButton" : "applyButton"));
-  },
-
-  /**
-   * Starts the download of an update mar.
-   */
-  startDownload: function() {
-    if (!this.update)
-      this.update = this.um.activeUpdate;
-    this.update.QueryInterface(Components.interfaces.nsIWritablePropertyBag);
-    this.update.setProperty("foregroundDownload", "true");
-
-    this.aus.pauseDownload();
-    let state = this.aus.downloadUpdate(this.update, false);
-    if (state == "failed") {
-      this.selectPanel("downloadFailed");
-      return;
-    }
-
-    this.setupDownloadingUI();
-  },
-
-  /**
-   * Switches to the UI responsible for tracking the download.
-   */
-  setupDownloadingUI: function() {
-    this.downloadStatus = document.getElementById("downloadStatus");
-    this.downloadStatus.value =
-      DownloadUtils.getTransferTotal(0, this.update.selectedPatch.size);
-    this.selectPanel("downloading");
-    this.aus.addDownloadListener(this);
-  },
-
-  removeDownloadListener: function() {
-    if (this.aus) {
-      this.aus.removeDownloadListener(this);
-    }
-  },
-
-  /**
-   * See nsIRequestObserver.idl
-   */
-  onStartRequest: function(aRequest, aContext) {
-  },
-
-  /**
-   * See nsIRequestObserver.idl
-   */
-  onStopRequest: function(aRequest, aContext, aStatusCode) {
-    switch (aStatusCode) {
-    case Components.results.NS_ERROR_UNEXPECTED:
-      if (this.update.selectedPatch.state == "download-failed" &&
-          (this.update.isCompleteUpdate || this.update.patchCount != 2)) {
-        // Verification error of complete patch, informational text is held in
-        // the update object.
-        this.removeDownloadListener();
-        this.selectPanel("downloadFailed");
-        break;
-      }
-      // Verification failed for a partial patch, complete patch is now
-      // downloading so return early and do NOT remove the download listener!
-      break;
-    case Components.results.NS_BINDING_ABORTED:
-      // Do not remove UI listener since the user may resume downloading again.
-      break;
-    case Components.results.NS_OK:
-      this.removeDownloadListener();
-      if (this.backgroundUpdateEnabled) {
-        this.selectPanel("applying");
-        let update = this.um.activeUpdate;
-        let self = this;
-        Services.obs.addObserver(function (aSubject, aTopic, aData) {
-          // Update the UI when the background updater is finished
-          let status = aData;
-          if (status == "applied" || status == "applied-service" ||
-              status == "pending" || status == "pending-service") {
-            // If the update is successfully applied, or if the updater has
-            // fallen back to non-staged updates, show the Restart to Update
-            // button.
-            self.selectPanel("updateButtonBox");
-            self.setupUpdateButton("update.restart." +
-                                   (self.isMajor ? "upgradeButton" : "updateButton"));
-          } else if (status == "failed") {
-            // Background update has failed, let's show the UI responsible for
-            // prompting the user to update manually.
-            self.selectPanel("downloadFailed");
-          } else if (status == "downloading") {
-            // We've fallen back to downloading the full update because the
-            // partial update failed to get staged in the background.
-            // Therefore we need to keep our observer.
-            self.setupDownloadingUI();
-            return;
-          }
-          Services.obs.removeObserver(arguments.callee, "update-staged");
-        }, "update-staged", false);
-      } else {
-        this.selectPanel("updateButtonBox");
-        this.setupUpdateButton("update.restart." +
-                               (this.isMajor ? "upgradeButton" : "updateButton"));
-      }
-      break;
-    default:
-      this.removeDownloadListener();
-      this.selectPanel("downloadFailed");
-      break;
-    }
-
-  },
-
-  /**
-   * See nsIProgressEventSink.idl
-   */
-  onStatus: function(aRequest, aContext, aStatus, aStatusArg) {
-  },
-
-  /**
-   * See nsIProgressEventSink.idl
-   */
-  onProgress: function(aRequest, aContext, aProgress, aProgressMax) {
-    this.downloadStatus.value =
-      DownloadUtils.getTransferTotal(aProgress, aProgressMax);
-  },
-
-  /**
-   * See nsISupports.idl
-   */
-  QueryInterface: function(aIID) {
-    if (!aIID.equals(Components.interfaces.nsIProgressEventSink) &&
-        !aIID.equals(Components.interfaces.nsIRequestObserver) &&
-        !aIID.equals(Components.interfaces.nsISupports))
-      throw Components.results.NS_ERROR_NO_INTERFACE;
-    return this;
-  }
-};
-#endif
diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul
index 5c344f55d..ff4c83bbd 100644
--- a/application/palemoon/base/content/aboutDialog.xul
+++ b/application/palemoon/base/content/aboutDialog.xul
@@ -50,44 +50,6 @@
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 
-        <vbox id="detailsBox">
-          <vbox id="updateBox">
-#ifdef MOZ_UPDATER
-            <deck id="updateDeck" orient="vertical">
-              <hbox id="updateButtonBox" align="center">
-                <button id="updateButton" align="start"
-                        oncommand="gAppUpdater.buttonOnCommand();"/>
-                <spacer flex="1"/>
-              </hbox>
-              <hbox id="checkingForUpdates" align="center">
-                <image class="update-throbber"/><label>&update.checkingForUpdates;</label>
-              </hbox>
-              <hbox id="checkingAddonCompat" align="center">
-                <image class="update-throbber"/><label>&update.checkingAddonCompat;</label>
-              </hbox>
-              <hbox id="downloading" align="center">
-                <image class="update-throbber"/><label>&update.downloading.start;</label><label id="downloadStatus"/><label>&update.downloading.end;</label>
-              </hbox>
-              <hbox id="applying" align="center">
-                <image class="update-throbber"/><label>&update.applying;</label>
-              </hbox>
-              <hbox id="downloadFailed" align="center">
-                <label>&update.failed.start;</label><label id="failedLink" class="text-link">&update.failed.linkText;</label><label>&update.failed.end;</label>
-              </hbox>
-              <hbox id="adminDisabled" align="center">
-                <label>&update.adminDisabled;</label>
-              </hbox>
-              <hbox id="noUpdatesFound" align="center">
-                <label>&update.noUpdatesFound;</label>
-              </hbox>
-              <hbox id="manualUpdate" align="center">
-                <label>&update.manual.start;</label><label id="manualLink" class="text-link"/><label>&update.manual.end;</label>
-              </hbox>
-            </deck>
-#endif
-          </vbox>
-
-        <description class="text-pmcreds">
 #if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
 #ifdef MC_PRIVATE_BUILD
           This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
-- 
cgit v1.2.3


From f0c57ac5f22022bc42fc1763297c3bcbf42c45fe Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Mon, 4 Mar 2019 13:02:25 +0100
Subject: Update about box design.

Tag #963.
---
 application/palemoon/base/content/aboutDialog.css | 46 +++++++++++------------
 application/palemoon/base/content/aboutDialog.xul | 30 +++++++--------
 2 files changed, 37 insertions(+), 39 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/aboutDialog.css b/application/palemoon/base/content/aboutDialog.css
index b82c7fdc3..b0cb5ea39 100644
--- a/application/palemoon/base/content/aboutDialog.css
+++ b/application/palemoon/base/content/aboutDialog.css
@@ -2,29 +2,20 @@
  * 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/. */
 
-#PMaboutDialog {
-  width: 620px;
+#aboutPMDialogContainer {
+  width: 700px;
+  height: 410px;
 }
 
-#PMrightBox {
-  background-image: url("chrome://branding/content/about-wordmark.png");
-  background-repeat: no-repeat;
-  /* padding-top creates room for the wordmark */
-  padding-top: 38px;
-  margin-top:20px;
+#aboutVersionBox {
+  height: 38 px;
 }
 
-#PMrightBox:-moz-locale-dir(rtl) {
-  background-position: 100% 0;
-}
-
-#PMbottomBox {
-  padding: 15px 10px 0;
-}
-
-#PMversion {
-  margin-top: 10px;
-  -moz-margin-start: 0;
+#aboutVersion {
+  text-align: center;
+  font-size: 18px;
+  font-weight: bold;
+  margin: 4px;
 }
 
 #distribution,
@@ -35,13 +26,10 @@
   margin-bottom: 0;
 }
 
-.text-blurb {
-  margin-bottom: 10px;
-  -moz-margin-start: 0;
-  -moz-padding-start: 0;
+.text-credits {
+  margin: 5px 0px;
 }
 
-
 .text-link,
 .text-link:focus {
   margin: 0px;
@@ -51,5 +39,15 @@
 .bottom-link,
 .bottom-link:focus {
   text-align: center;
+  text-decoration: none !important;
+  padding: 4px;
+  border-radius: 3px;
+  color: #244C8A;
+  background-color: rgba(240, 240, 240, .7);
   margin: 0 40px;
+  transition: background-color 0.5s ease-out;
+}
+
+.bottom-link:hover {
+  background-color: rgba(240, 240, 255, .95);
 }
diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul
index ff4c83bbd..ff9d2d71c 100644
--- a/application/palemoon/base/content/aboutDialog.xul
+++ b/application/palemoon/base/content/aboutDialog.xul
@@ -38,48 +38,48 @@
 
   <script type="application/javascript" src="chrome://browser/content/aboutDialog.js"/>
 
-  <vbox id="aboutPMDialogContainer">
-    <hbox id="PMclientBox">
-      <vbox id="PMleftBox" flex="1"/>
-      <vbox id="PMrightBox" flex="1">
+  <vbox id="aboutPMDialogContainer" flex="1">
+    <vbox id="aboutHeaderBox" />
+    <vbox id="aboutVersionBox" flex="3">
 #ifdef HAVE_64BIT_BUILD
-#expand <label id="PMversion">Version: __MOZ_APP_VERSION__ (64-bit)</label>
+#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (64-bit)</label>
 #else
-#expand <label id="PMversion">Version: __MOZ_APP_VERSION__ (32-bit)</label>
+#expand <label id="aboutVersion">Version: __MOZ_APP_VERSION__ (32-bit)</label>
 #endif
         <label id="distribution" class="text-blurb"/>
         <label id="distributionId" class="text-blurb"/>
 
+    </vbox>
+    <vbox id="aboutTextBox" flex="1">
+        <description class="text-credits">
 #if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
 #ifdef MC_PRIVATE_BUILD
           This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
 #else
-          Pale Moon is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
+          <label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
         </description>
-        <description class="text-pmcreds">
+        <description class="text-credits">
           Special thanks to all our supporters and donors for making this browser possible!
         </description>
-        <description class="text-blurb">
+        <description class="text-credits">
           If you wish to contribute, please consider helping out by providing support to other users on the <label class="text-link" href="https://forum.palemoon.org/">Pale Moon forum</label>
           or getting involved in our development by tackling some of the issues found in our GitHub issue tracker.
 #endif
 #else
           &brandFullName; is released by &vendorShortName;.
         </description>
-        <description class="text-blurb">
+        <description class="text-credits">
           This is an unofficial build of Pale Moon. For official builds, please go to <label class="text-link" href="http://www.palemoon.org/">the Pale Moon website</label>.
 #endif
         </description>    
-        </vbox>
-      </vbox>
-    </hbox>
-    <vbox id="PMbottomBox">
+    </vbox>
+    <vbox id="aboutLinkBox">
       <hbox pack="center">
         <label class="text-link bottom-link" href="about:license">Licensing information</label>
         <label class="text-link bottom-link" href="about:rights">End-user rights</label>
         <label class="text-link bottom-link" id="releaseNotesURL">Release notes</label>
       </hbox>
-      <description id="PMtrademark">&trademarkInfo.part1;</description>
+      <description id="aboutPMtrademark">&trademarkInfo.part1;</description>
     </vbox>
   </vbox>
   
-- 
cgit v1.2.3


From 97be0f65ccc1b89d2d9ef999e21c56f69ae637c6 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Mon, 4 Mar 2019 13:32:11 +0100
Subject: Fix dynamic addition of build date.

---
 application/palemoon/base/content/aboutDialog.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/aboutDialog.js b/application/palemoon/base/content/aboutDialog.js
index 980c64259..e4e18f2cf 100644
--- a/application/palemoon/base/content/aboutDialog.js
+++ b/application/palemoon/base/content/aboutDialog.js
@@ -42,7 +42,7 @@ function init(aEvent)
   if (/[ab]\d+$/.test(version)) {
     let buildID = Services.appinfo.appBuildID;
     let buildDate = buildID.slice(0,4) + "-" + buildID.slice(4,6) + "-" + buildID.slice(6,8);
-    document.getElementById("PMversion").textContent += " (" + buildDate + ")";
+    document.getElementById("aboutVersion").textContent += " (" + buildDate + ")";
   }
 
 #ifdef XP_MACOSX
-- 
cgit v1.2.3


From a7bca40ad5044a55358fe1c839a613da644a2bd2 Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Tue, 5 Mar 2019 14:41:20 +0100
Subject: Tweak the about box layout a bit.

- Put the Licensing link in the center
- Strengthen the "fog" background for the credits text for readability
- Add CSS animation to fade it in.
---
 application/palemoon/base/content/aboutDialog.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul
index ff9d2d71c..cc865f054 100644
--- a/application/palemoon/base/content/aboutDialog.xul
+++ b/application/palemoon/base/content/aboutDialog.xul
@@ -75,8 +75,8 @@
     </vbox>
     <vbox id="aboutLinkBox">
       <hbox pack="center">
-        <label class="text-link bottom-link" href="about:license">Licensing information</label>
         <label class="text-link bottom-link" href="about:rights">End-user rights</label>
+        <label class="text-link bottom-link" href="about:license">Licensing information</label>
         <label class="text-link bottom-link" id="releaseNotesURL">Release notes</label>
       </hbox>
       <description id="aboutPMtrademark">&trademarkInfo.part1;</description>
-- 
cgit v1.2.3


From 403605efb578527388f4af523eefaebaeb7e10ae Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Wed, 6 Mar 2019 00:51:39 +0100
Subject: Tweak the about box styling some more and clean up styles.

---
 application/palemoon/base/content/aboutDialog.css | 21 +++++++++++++++++++++
 application/palemoon/base/content/aboutDialog.xul |  4 ++--
 2 files changed, 23 insertions(+), 2 deletions(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/aboutDialog.css b/application/palemoon/base/content/aboutDialog.css
index b0cb5ea39..d96eba5a2 100644
--- a/application/palemoon/base/content/aboutDialog.css
+++ b/application/palemoon/base/content/aboutDialog.css
@@ -8,6 +8,7 @@
 }
 
 #aboutVersionBox {
+  font-family: Arial, helvetica;
   height: 38 px;
 }
 
@@ -20,16 +21,36 @@
 
 #distribution,
 #distributionId {
+  text-align: center;
+  font-size: 14px;
   font-weight: bold;
   display: none;
   margin-top: 0;
   margin-bottom: 0;
 }
 
+#aboutTextBox {
+  font-family: Arial, helvetica;
+  font-size: 14px;
+  margin: 5px 20px;
+  padding: 4px 10px 0px;
+  border-radius: 3px;
+  color: black;
+  background-color: rgba(240, 240, 240, .6);
+}
+
+#aboutLinkBox {
+  font-family: Arial, helvetica;
+}
+
 .text-credits {
   margin: 5px 0px;
 }
 
+.text-center {
+  text-align: center;
+}
+
 .text-link,
 .text-link:focus {
   margin: 0px;
diff --git a/application/palemoon/base/content/aboutDialog.xul b/application/palemoon/base/content/aboutDialog.xul
index cc865f054..a34923a0a 100644
--- a/application/palemoon/base/content/aboutDialog.xul
+++ b/application/palemoon/base/content/aboutDialog.xul
@@ -51,14 +51,14 @@
 
     </vbox>
     <vbox id="aboutTextBox" flex="1">
-        <description class="text-credits">
+        <description class="text-credits text-center">
 #if defined(MOZ_OFFICIAL_BRANDING) || defined(MC_OFFICIAL)
 #ifdef MC_PRIVATE_BUILD
           This is a private build of Pale Moon. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.palemoon.org/">Pale Moon website</label>.
 #else
           <label class="text-link" href="http://www.palemoon.org">Pale Moon</label> is released by <label class="text-link" href="http://www.moonchildproductions.info">Moonchild Productions</label>.
         </description>
-        <description class="text-credits">
+        <description class="text-credits text-center">
           Special thanks to all our supporters and donors for making this browser possible!
         </description>
         <description class="text-credits">
-- 
cgit v1.2.3


From baeec92b6a638cb6d72876591cfbeb04418cb04b Mon Sep 17 00:00:00 2001
From: "Matt A. Tobin" <email@mattatobin.com>
Date: Wed, 6 Mar 2019 11:42:52 -0500
Subject: [PALEMOON] Fix updatesSeparator id mismatch

---
 application/palemoon/base/content/baseMenuOverlay.xul | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'application/palemoon/base')

diff --git a/application/palemoon/base/content/baseMenuOverlay.xul b/application/palemoon/base/content/baseMenuOverlay.xul
index d7c983671..a006ed5c6 100644
--- a/application/palemoon/base/content/baseMenuOverlay.xul
+++ b/application/palemoon/base/content/baseMenuOverlay.xul
@@ -66,7 +66,7 @@
                   accesskey="&helpSafeMode.accesskey;"
                   label="&helpSafeMode.label;"
                   oncommand="restart(true);"/>
-        <menuseparator id="updateSeparator"/>
+        <menuseparator id="updatesSeparator"/>
         <menuitem id="checkForUpdates" class="menuitem-iconic"
 #ifdef MOZ_UPDATER
                   label="&updateCmd.label;"
-- 
cgit v1.2.3