diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 23:01:30 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-06-29 23:01:30 +0200 |
| commit | 562326d0c25838bcf6e3a302ad3181e8a68f8e3c (patch) | |
| tree | 95057f6ac6f23346f0c795b5d129c745647aa1ef /application/palemoon/base/content | |
| parent | eb71020782b0c0bb6a128496010f1bb926625370 (diff) | |
| parent | 98f7e3b16754aedd44747261113359b8d824449f (diff) | |
| download | UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar.gz UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar.lz UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.tar.xz UXP-562326d0c25838bcf6e3a302ad3181e8a68f8e3c.zip | |
Merge branch 'master' into Pale_Moon-releasePM28.6.0_Release
Diffstat (limited to 'application/palemoon/base/content')
| -rw-r--r-- | application/palemoon/base/content/browser-addons.js | 3 | ||||
| -rw-r--r-- | application/palemoon/base/content/browser.js | 2 | ||||
| -rw-r--r-- | application/palemoon/base/content/browser.xul | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/application/palemoon/base/content/browser-addons.js b/application/palemoon/base/content/browser-addons.js index f5c398f33..630a0cf79 100644 --- a/application/palemoon/base/content/browser-addons.js +++ b/application/palemoon/base/content/browser-addons.js @@ -263,7 +263,7 @@ var AddonsMgrListener = { onDisabled: function(aAddon) this.onUninstalled(), }; - +#ifdef MOZ_PERSONAS var LightWeightThemeWebInstaller = { handleEvent: function (event) { switch (event.type) { @@ -534,3 +534,4 @@ var LightweightThemeListener = { this.updateStyleSheet("url(" + themeData.headerURL + ")"); }, }; +#endif diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js index 16b7c0019..a5d77a90d 100644 --- a/application/palemoon/base/content/browser.js +++ b/application/palemoon/base/content/browser.js @@ -1216,9 +1216,11 @@ var gBrowserInit = { placesContext.addEventListener("popuphiding", updateEditUIVisibility, false); #endif +#ifdef MOZ_PERSONAS gBrowser.mPanelContainer.addEventListener("InstallBrowserTheme", LightWeightThemeWebInstaller, false, true); gBrowser.mPanelContainer.addEventListener("PreviewBrowserTheme", LightWeightThemeWebInstaller, false, true); gBrowser.mPanelContainer.addEventListener("ResetBrowserThemePreview", LightWeightThemeWebInstaller, false, true); +#endif // Bug 666808 - AeroPeek support for e10s if (!gMultiProcessBrowser) { diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index ddc305a7b..0a249afa9 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -53,8 +53,10 @@ titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" #endif titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" +#ifdef MOZ_PERSONAS lightweightthemes="true" lightweightthemesfooter="browser-bottombox" +#endif windowtype="navigator:browser" macanimationtype="document" screenX="4" screenY="4" |