diff options
Diffstat (limited to 'application')
33 files changed, 144 insertions, 148 deletions
diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js index 90b4949b9..000113fe7 100644 --- a/application/palemoon/app/profile/palemoon.js +++ b/application/palemoon/app/profile/palemoon.js @@ -433,6 +433,8 @@ pref("browser.tabs.loadDivertedInBackground", false); pref("browser.tabs.loadBookmarksInBackground", false); pref("browser.tabs.noWindowActivationOnExternal", false); pref("browser.tabs.tabClipWidth", 140); +pref("browser.tabs.tabMinWidth", 100); +pref("browser.tabs.tabMaxWidth", 250); pref("browser.tabs.animate", true); pref("browser.tabs.onTop", true); #ifdef XP_WIN @@ -1079,6 +1081,8 @@ pref("security.csp.speccompliant", true); // Block insecure active content on https pages pref("security.mixed_content.block_active_content", true); +// Disable HPKP telemetry +pref("security.ssl.errorReporting.enabled", false); // Override the Goanna-default value of false for Firefox. pref("plain_text.wrap_long_lines", true); diff --git a/application/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css index a2970aefc..76e49436c 100644 --- a/application/palemoon/base/content/browser.css +++ b/application/palemoon/base/content/browser.css @@ -43,8 +43,6 @@ tabbrowser { .tabbrowser-tab:not([pinned]) { -moz-box-flex: 100; - max-width: 250px; - min-width: 100px; width: 0; transition: min-width 175ms ease-out, max-width 200ms ease-out, @@ -67,6 +65,12 @@ tabbrowser { display: none; } +.tabbrowser-tab[pinned] { + -moz-box-flex: 0; + min-width: 0 !important; + max-width: none !important; +} + .tabbrowser-tabs[positionpinnedtabs] > .tabbrowser-tab[pinned] { position: fixed !important; display: block; /* position:fixed already does this (bug 579776), but let's be explicit */ diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js index c1643caa4..4bdac7850 100644 --- a/application/palemoon/base/content/browser.js +++ b/application/palemoon/base/content/browser.js @@ -420,7 +420,8 @@ var gPopupBlockerObserver = { if (!this._reportButton && gURLBar) this._reportButton = document.getElementById("page-report-button"); - if (!gBrowser.selectedBrowser.blockedPopups) { + if (!gBrowser.selectedBrowser.blockedPopups || + !gBrowser.selectedBrowser.blockedPopups.length) { // Hide the icon in the location bar (if the location bar exists) if (gURLBar) this._reportButton.hidden = true; @@ -522,65 +523,66 @@ var gPopupBlockerObserver = { else blockedPopupAllowSite.removeAttribute("disabled"); - var foundUsablePopupURI = false; - var blockedPopups = browser.blockedPopups; - if (blockedPopups) { - for (let i = 0; i < blockedPopups.length; i++) { - let blockedPopup = blockedPopups[i]; - - // popupWindowURI will be null if the file picker popup is blocked. - // xxxdz this should make the option say "Show file picker" and do it (Bug 590306) - if (!blockedPopup.popupWindowURI) - continue; - var popupURIspec = blockedPopup.popupWindowURI.spec; - - // Sometimes the popup URI that we get back from the blockedPopup - // isn't useful (for instance, netscape.com's popup URI ends up - // being "http://www.netscape.com", which isn't really the URI of - // the popup they're trying to show). This isn't going to be - // useful to the user, so we won't create a menu item for it. - if (popupURIspec == "" || popupURIspec == "about:blank" || - popupURIspec == uri.spec) - continue; - - // Because of the short-circuit above, we may end up in a situation - // in which we don't have any usable popup addresses to show in - // the menu, and therefore we shouldn't show the separator. However, - // since we got past the short-circuit, we must've found at least - // one usable popup URI and thus we'll turn on the separator later. - foundUsablePopupURI = true; - - var menuitem = document.createElement("menuitem"); - var label = gNavigatorBundle.getFormattedString("popupShowPopupPrefix", - [popupURIspec]); - menuitem.setAttribute("label", label); - menuitem.setAttribute("popupWindowURI", popupURIspec); - menuitem.setAttribute("popupWindowFeatures", blockedPopup.popupWindowFeatures); - menuitem.setAttribute("popupWindowName", blockedPopup.popupWindowName); - menuitem.setAttribute("oncommand", "gPopupBlockerObserver.showBlockedPopup(event);"); - menuitem.setAttribute("popupReportIndex", i); - menuitem.popupReportBrowser = browser; - aEvent.target.appendChild(menuitem); - } - } - - // Show or hide the separator, depending on whether we added any - // showable popup addresses to the menu. - var blockedPopupsSeparator = - document.getElementById("blockedPopupsSeparator"); - if (foundUsablePopupURI) - blockedPopupsSeparator.removeAttribute("hidden"); - else - blockedPopupsSeparator.setAttribute("hidden", true); - - var blockedPopupDontShowMessage = document.getElementById("blockedPopupDontShowMessage"); - var showMessage = gPrefService.getBoolPref("privacy.popups.showBrowserMessage"); + let blockedPopupDontShowMessage = document.getElementById("blockedPopupDontShowMessage"); + let showMessage = gPrefService.getBoolPref("privacy.popups.showBrowserMessage"); blockedPopupDontShowMessage.setAttribute("checked", !showMessage); if (aEvent.target.anchorNode.id == "page-report-button") { aEvent.target.anchorNode.setAttribute("open", "true"); blockedPopupDontShowMessage.setAttribute("label", gNavigatorBundle.getString("popupWarningDontShowFromLocationbar")); - } else + } else { blockedPopupDontShowMessage.setAttribute("label", gNavigatorBundle.getString("popupWarningDontShowFromMessage")); + } + + let blockedPopupsSeparator = + document.getElementById("blockedPopupsSeparator"); + blockedPopupsSeparator.setAttribute("hidden", true); + + gBrowser.selectedBrowser.retrieveListOfBlockedPopups().then(blockedPopups => { + let foundUsablePopupURI = false; + if (blockedPopups) { + for (let i = 0; i < blockedPopups.length; i++) { + let blockedPopup = blockedPopups[i]; + + // popupWindowURI will be null if the file picker popup is blocked. + // xxxdz this should make the option say "Show file picker" and do it (Bug 590306) + if (!blockedPopup.popupWindowURIspec) + continue; + + var popupURIspec = blockedPopup.popupWindowURIspec; + + // Sometimes the popup URI that we get back from the blockedPopup + // isn't useful (for instance, netscape.com's popup URI ends up + // being "http://www.netscape.com", which isn't really the URI of + // the popup they're trying to show). This isn't going to be + // useful to the user, so we won't create a menu item for it. + if (popupURIspec == "" || popupURIspec == "about:blank" || + popupURIspec == "<self>" || + popupURIspec == uri.spec) + continue; + + // Because of the short-circuit above, we may end up in a situation + // in which we don't have any usable popup addresses to show in + // the menu, and therefore we shouldn't show the separator. However, + // since we got past the short-circuit, we must've found at least + // one usable popup URI and thus we'll turn on the separator later. + foundUsablePopupURI = true; + + var menuitem = document.createElement("menuitem"); + var label = gNavigatorBundle.getFormattedString("popupShowPopupPrefix", + [popupURIspec]); + menuitem.setAttribute("label", label); + menuitem.setAttribute("oncommand", "gPopupBlockerObserver.showBlockedPopup(event);"); + menuitem.setAttribute("popupReportIndex", i); + menuitem.popupReportBrowser = browser; + aEvent.target.appendChild(menuitem); + } + } + + // Show the separator if we added any + // showable popup addresses to the menu. + if (foundUsablePopupURI) + blockedPopupsSeparator.removeAttribute("hidden"); + }, null); }, onPopupHiding: function (aEvent) { @@ -3096,6 +3098,8 @@ const BrowserSearch = { }, }; +XPCOMUtils.defineConstant(this, "BrowserSearch", BrowserSearch); + function FillHistoryMenu(aParent) { // Lazily add the hover listeners on first showing and never remove them if (!aParent.hasStatusListener) { @@ -6768,7 +6772,7 @@ function getTabModalPromptBox(aWindow) { function getBrowser() gBrowser; function getNavToolbox() gNavToolbox; -let gPrivateBrowsingUI = { +var gPrivateBrowsingUI = { init: function PBUI_init() { // Do nothing for normal windows if (!PrivateBrowsingUtils.isWindowPrivate(window)) { diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index f9030056e..254e2eee0 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -452,7 +452,6 @@ <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> - <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/> <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/> <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/> <image id="alert-plugins-notification-icon" class="notification-anchor-icon" role="button"/> diff --git a/application/palemoon/base/content/newtab/grid.js b/application/palemoon/base/content/newtab/grid.js index a614d0396..fbeb7bd27 100644 --- a/application/palemoon/base/content/newtab/grid.js +++ b/application/palemoon/base/content/newtab/grid.js @@ -115,10 +115,10 @@ var gGrid = { // (Re-)initialize all cells. let cellElements = this.node.querySelectorAll(".newtab-cell"); // Tycho: this._cells = [new Cell(this, cell) for (cell of cellElements)]; - this.cells = []; + this._cells = []; for (let cellItem of cellElements) { - this.cells.push(new Cell(this, cellItem)); + this._cells.push(new Cell(this, cellItem)); } }, diff --git a/application/palemoon/base/content/pageinfo/pageInfo.js b/application/palemoon/base/content/pageinfo/pageInfo.js index 6b02bc370..600174ad9 100644 --- a/application/palemoon/base/content/pageinfo/pageInfo.js +++ b/application/palemoon/base/content/pageinfo/pageInfo.js @@ -2,7 +2,7 @@ * 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/. */ -const Cu = Components.utils; +var Cu = Components.utils; Cu.import("resource://gre/modules/LoadContextInfo.jsm"); Cu.import("resource://gre/modules/Services.jsm"); diff --git a/application/palemoon/base/content/sanitizeDialog.js b/application/palemoon/base/content/sanitizeDialog.js index 18df5e4a4..786113288 100644 --- a/application/palemoon/base/content/sanitizeDialog.js +++ b/application/palemoon/base/content/sanitizeDialog.js @@ -3,8 +3,8 @@ * 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/. */ -const Cc = Components.classes; -const Ci = Components.interfaces; +var Cc = Components.classes; +var Ci = Components.interfaces; var gSanitizePromptDialog = { diff --git a/application/palemoon/base/content/sync/aboutSyncTabs.js b/application/palemoon/base/content/sync/aboutSyncTabs.js index bc624a459..410494b5b 100644 --- a/application/palemoon/base/content/sync/aboutSyncTabs.js +++ b/application/palemoon/base/content/sync/aboutSyncTabs.js @@ -2,7 +2,7 @@ * 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/. */ -const Cu = Components.utils; +var Cu = Components.utils; Cu.import("resource://services-common/utils.js"); Cu.import("resource://services-sync/main.js"); diff --git a/application/palemoon/base/content/sync/addDevice.js b/application/palemoon/base/content/sync/addDevice.js index 40862a791..0390d4397 100644 --- a/application/palemoon/base/content/sync/addDevice.js +++ b/application/palemoon/base/content/sync/addDevice.js @@ -2,9 +2,9 @@ * 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/. */ -const Ci = Components.interfaces; -const Cc = Components.classes; -const Cu = Components.utils; +var Ci = Components.interfaces; +var Cc = Components.classes; +var Cu = Components.utils; Cu.import("resource://services-sync/main.js"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); diff --git a/application/palemoon/base/content/sync/genericChange.js b/application/palemoon/base/content/sync/genericChange.js index 0c6dc145e..df6639178 100644 --- a/application/palemoon/base/content/sync/genericChange.js +++ b/application/palemoon/base/content/sync/genericChange.js @@ -2,8 +2,8 @@ * 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/. */ -const Ci = Components.interfaces; -const Cc = Components.classes; +var Ci = Components.interfaces; +var Cc = Components.classes; Components.utils.import("resource://services-sync/main.js"); Components.utils.import("resource://gre/modules/Services.jsm"); diff --git a/application/palemoon/base/content/sync/setup.js b/application/palemoon/base/content/sync/setup.js index 99faa038e..e8d67a5f6 100644 --- a/application/palemoon/base/content/sync/setup.js +++ b/application/palemoon/base/content/sync/setup.js @@ -2,10 +2,10 @@ * 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/. */ -const Ci = Components.interfaces; -const Cc = Components.classes; -const Cr = Components.results; -const Cu = Components.utils; +var Ci = Components.interfaces; +var Cc = Components.classes; +var Cr = Components.results; +var Cu = Components.utils; // page consts diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml index 1b8099785..10f109ce8 100644 --- a/application/palemoon/base/content/tabbrowser.xml +++ b/application/palemoon/base/content/tabbrowser.xml @@ -1445,6 +1445,9 @@ t.setAttribute("label", aURI); t.setAttribute("crop", "end"); + t.style.maxWidth = this.tabContainer.mTabMaxWidth + "px"; + t.style.minWidth = this.tabContainer.mTabMinWidth + "px"; + t.width = 0; t.setAttribute("validate", "never"); //PMed t.setAttribute("onerror", "this.removeAttribute('image');"); t.className = "tabbrowser-tab"; @@ -3410,6 +3413,8 @@ <implementation implements="nsIDOMEventListener"> <constructor> <![CDATA[ + this.mTabMinWidth = Services.prefs.getIntPref("browser.tabs.tabMinWidth"); + this.mTabMaxWidth = Services.prefs.getIntPref("browser.tabs.tabMaxWidth"); this.mTabClipWidth = Services.prefs.getIntPref("browser.tabs.tabClipWidth"); this.mCloseButtons = Services.prefs.getIntPref("browser.tabs.closeButtons"); this._closeWindowWithLastTab = Services.prefs.getBoolPref("browser.tabs.closeWindowWithLastTab"); @@ -3417,6 +3422,9 @@ var tab = this.firstChild; tab.setAttribute("label", this.tabbrowser.mStringBundle.getString("tabs.emptyTabTitle")); + tab.style.minWidth = this.mTabMinWidth + "px"; + tab.style.maxWidth = this.mTabMaxWidth + "px"; + tab.width = 0; tab.setAttribute("crop", "end"); tab.setAttribute("onerror", "this.removeAttribute('image');"); this.adjustTabstrip(); diff --git a/application/palemoon/components/distribution.js b/application/palemoon/components/distribution.js index b44b5bed3..d3300604e 100644 --- a/application/palemoon/components/distribution.js +++ b/application/palemoon/components/distribution.js @@ -4,10 +4,10 @@ this.EXPORTED_SYMBOLS = [ "DistributionCustomizer" ]; -const Ci = Components.interfaces; -const Cc = Components.classes; -const Cr = Components.results; -const Cu = Components.utils; +var Ci = Components.interfaces; +var Cc = Components.classes; +var Cr = Components.results; +var Cu = Components.utils; const DISTRIBUTION_CUSTOMIZATION_COMPLETE_TOPIC = "distribution-customization-complete"; diff --git a/application/palemoon/components/places/content/bookmarkProperties.js b/application/palemoon/components/places/content/bookmarkProperties.js index 22bd51773..685ef57d2 100644 --- a/application/palemoon/components/places/content/bookmarkProperties.js +++ b/application/palemoon/components/places/content/bookmarkProperties.js @@ -61,6 +61,8 @@ Components.utils.import('resource://gre/modules/XPCOMUtils.jsm'); XPCOMUtils.defineLazyModuleGetter(this, "PrivateBrowsingUtils", "resource://gre/modules/PrivateBrowsingUtils.jsm"); +XPCOMUtils.defineLazyModuleGetter(this, "Task", + "resource://gre/modules/Task.jsm"); const BOOKMARK_ITEM = 0; const BOOKMARK_FOLDER = 1; @@ -303,7 +305,7 @@ var BookmarkPropertiesPanel = { * This method should be called by the onload of the Bookmark Properties * dialog to initialize the state of the panel. */ - onDialogLoad: function BPP_onDialogLoad() { + onDialogLoad: Task.async(function* BPP_onDialogLoad() { this._determineItemInfo(); document.title = this._getDialogTitle(); @@ -355,7 +357,7 @@ var BookmarkPropertiesPanel = { acceptButton.disabled = this._readOnly; break; case ACTION_ADD: - this._fillAddProperties(); + yield this._fillAddProperties(); // if this is an uri related dialog disable accept button until // the user fills an uri value. if (this._itemType == BOOKMARK_ITEM) @@ -380,7 +382,7 @@ var BookmarkPropertiesPanel = { .addEventListener("input", this, false); } } - }, + }), // nsIDOMEventListener handleEvent: function BPP_handleEvent(aEvent) { @@ -428,8 +430,8 @@ var BookmarkPropertiesPanel = { forceReadOnly: this._readOnly }); }, - _fillAddProperties: function BPP__fillAddProperties() { - this._createNewItem(); + _fillAddProperties: Task.async(function* BPP__fillAddProperties() { + yield this._createNewItem(); // Edit the new item gEditItemOverlay.initPanel(this._itemId, { hiddenRows: this._hiddenRows }); @@ -439,7 +441,7 @@ var BookmarkPropertiesPanel = { var locationField = this._element("locationField"); if (locationField.value == "about:blank") locationField.value = ""; - }, + }), // nsISupports QueryInterface: function BPP_QueryInterface(aIID) { @@ -637,7 +639,7 @@ var BookmarkPropertiesPanel = { /** * Dialog-accept code-path for creating a new item (any type) */ - _createNewItem: function BPP__getCreateItemTransaction() { + _createNewItem: Task.async(function* BPP__getCreateItemTransaction() { var [container, index] = this._getInsertionPointDetails(); var txn; @@ -647,12 +649,22 @@ var BookmarkPropertiesPanel = { break; case LIVEMARK_CONTAINER: txn = this._getCreateNewLivemarkTransaction(container, index); - break; + break; default: // BOOKMARK_ITEM txn = this._getCreateNewBookmarkTransaction(container, index); } PlacesUtils.transactionManager.doTransaction(txn); - this._itemId = PlacesUtils.bookmarks.getIdForItemAt(container, index); - } + // This is a temporary hack until we use PlacesTransactions.jsm + if (txn._promise) { + yield txn._promise; + } + + let folderGuid = yield PlacesUtils.promiseItemGuid(container); + let bm = yield PlacesUtils.bookmarks.fetch({ + parentGuid: folderGuid, + index: index + }); + this._itemId = yield PlacesUtils.promiseItemId(bm.guid); + }) }; diff --git a/application/palemoon/components/sessionstore/content/aboutSessionRestore.js b/application/palemoon/components/sessionstore/content/aboutSessionRestore.js index cae3bf4de..2459b67f5 100644 --- a/application/palemoon/components/sessionstore/content/aboutSessionRestore.js +++ b/application/palemoon/components/sessionstore/content/aboutSessionRestore.js @@ -2,9 +2,9 @@ * 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/. */ -const Cc = Components.classes; -const Ci = Components.interfaces; -const Cu = Components.utils; +var Cc = Components.classes; +var Ci = Components.interfaces; +var Cu = Components.utils; var gStateObject; var gTreeData; diff --git a/application/palemoon/components/sessionstore/content/content-sessionStore.js b/application/palemoon/components/sessionstore/content/content-sessionStore.js index bdf0fef0c..e3e956ef2 100644 --- a/application/palemoon/components/sessionstore/content/content-sessionStore.js +++ b/application/palemoon/components/sessionstore/content/content-sessionStore.js @@ -10,7 +10,7 @@ function debug(msg) { * Listens for and handles content events that we need for the * session store service to be notified of state changes in content. */ -let EventListener = { +var EventListener = { DOM_EVENTS: [ "pageshow", "change", "input" diff --git a/application/palemoon/config/version.txt b/application/palemoon/config/version.txt index b117d70fa..da03daefe 100644 --- a/application/palemoon/config/version.txt +++ b/application/palemoon/config/version.txt @@ -1 +1 @@ -28.0.0a1
\ No newline at end of file +28.0.0a2
\ No newline at end of file diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in index 368b16efc..3f009c51c 100644 --- a/application/palemoon/installer/Makefile.in +++ b/application/palemoon/installer/Makefile.in @@ -41,12 +41,12 @@ DEFINES += -DMOZ_GTK3=1 endif endif -ifdef MOZ_NATIVE_NSPR -DEFINES += -DMOZ_NATIVE_NSPR=1 +ifdef MOZ_SYSTEM_NSPR +DEFINES += -DMOZ_SYSTEM_NSPR=1 endif -ifdef MOZ_NATIVE_NSS -DEFINES += -DMOZ_NATIVE_NSS=1 +ifdef MOZ_SYSTEM_NSS +DEFINES += -DMOZ_SYSTEM_NSS=1 endif ifdef NSS_DISABLE_DBM diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index e6a4d49db..fb5441832 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -72,9 +72,6 @@ #ifndef MOZ_STATIC_JS @BINPATH@/@DLL_PREFIX@mozjs@DLL_SUFFIX@ #endif -#ifdef MOZ_DMD -@BINPATH@/@DLL_PREFIX@dmd@DLL_SUFFIX@ -#endif #ifndef MOZ_SYSTEM_NSPR #ifndef MOZ_FOLD_LIBS @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@ @@ -172,14 +169,10 @@ #endif #ifdef NS_PRINTING #endif -#ifdef MOZ_ENABLE_PROFILER_SPS -#endif #ifdef NECKO_WIFI #endif #ifdef MOZ_WEBRTC #endif -#ifdef MOZ_ENABLE_PROFILER_SPS -#endif #ifdef MOZ_ENABLE_XREMOTE #endif #ifdef XP_MACOSX @@ -206,9 +199,7 @@ @RESPATH@/browser/chrome.manifest @RESPATH@/browser/chrome/browser@JAREXT@ @RESPATH@/browser/chrome/browser.manifest -#ifdef XP_WIN @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest -#endif @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ diff --git a/application/palemoon/installer/windows/moz.build b/application/palemoon/installer/windows/moz.build index 12e7831ed..394a85ccf 100644 --- a/application/palemoon/installer/windows/moz.build +++ b/application/palemoon/installer/windows/moz.build @@ -4,8 +4,12 @@ # 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/. -DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] - DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME'] -DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] +DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION'] DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION'] + +if CONFIG['MOZ_APP_DISPLAYNAME'] in ('PaleMoon', 'Palemoon'): + DEFINES['MOZ_APP_DISPLAYNAME'] = "Pale Moon" +else: + DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME'] + diff --git a/application/palemoon/modules/Windows8WindowFrameColor.jsm b/application/palemoon/modules/Windows8WindowFrameColor.jsm index d424da499..e7a447db2 100644 --- a/application/palemoon/modules/Windows8WindowFrameColor.jsm +++ b/application/palemoon/modules/Windows8WindowFrameColor.jsm @@ -11,15 +11,15 @@ Cu.import("resource://gre/modules/Services.jsm"); Cu.import("resource://gre/modules/XPCOMUtils.jsm"); Cu.import("resource://gre/modules/WindowsRegistry.jsm"); -const Windows8WindowFrameColor = { +var Windows8WindowFrameColor = { _windowFrameColor: null, get_win8: function() { if (this._windowFrameColor) return this._windowFrameColor; - let HKCU = Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER; - let dwmKey = "Software\\Microsoft\\Windows\\DWM"; + const HKCU = Ci.nsIWindowsRegKey.ROOT_KEY_CURRENT_USER; + const dwmKey = "Software\\Microsoft\\Windows\\DWM"; // Window frame base color component values when Color Intensity is at 0. let frameBaseColor = 217; diff --git a/application/palemoon/themes/linux/browser.css b/application/palemoon/themes/linux/browser.css index dbdc06235..9a08ea4d8 100644 --- a/application/palemoon/themes/linux/browser.css +++ b/application/palemoon/themes/linux/browser.css @@ -1228,10 +1228,6 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } -.popup-notification-icon[popupid="webapps-install"] { - list-style-image: url(chrome://browser/skin/webapps-64.png); -} - .popup-notification-icon[popupid="mixed-content-blocked"] { list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png); } @@ -1305,10 +1301,6 @@ toolbar[iconsize="small"] #webrtc-status-button { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); } -#webapps-notification-icon { - list-style-image: url(chrome://browser/skin/webapps-16.png); -} - #plugins-notification-icon { list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); } diff --git a/application/palemoon/themes/linux/jar.mn b/application/palemoon/themes/linux/jar.mn index 3c2ac406e..570bbb153 100644 --- a/application/palemoon/themes/linux/jar.mn +++ b/application/palemoon/themes/linux/jar.mn @@ -136,8 +136,6 @@ browser.jar: skin/classic/browser/syncQuota.css skin/classic/browser/syncProgress.css #endif - skin/classic/browser/webapps-16.png - skin/classic/browser/webapps-64.png skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) skin/classic/browser/notification-pluginAlert.png (../shared/plugins/notification-pluginAlert.png) skin/classic/browser/notification-pluginBlocked.png (../shared/plugins/notification-pluginBlocked.png) diff --git a/application/palemoon/themes/linux/webapps-16.png b/application/palemoon/themes/linux/webapps-16.png Binary files differdeleted file mode 100644 index df3978c4c..000000000 --- a/application/palemoon/themes/linux/webapps-16.png +++ /dev/null diff --git a/application/palemoon/themes/linux/webapps-64.png b/application/palemoon/themes/linux/webapps-64.png Binary files differdeleted file mode 100644 index 7c5e48cb8..000000000 --- a/application/palemoon/themes/linux/webapps-64.png +++ /dev/null diff --git a/application/palemoon/themes/osx/browser.css b/application/palemoon/themes/osx/browser.css index 6307c5f58..485ed9115 100644 --- a/application/palemoon/themes/osx/browser.css +++ b/application/palemoon/themes/osx/browser.css @@ -1459,14 +1459,14 @@ richlistitem[type~="action"][actiontype="switchtab"][selected="true"] > .ac-url- linear-gradient(-moz-dialog, -moz-dialog); } -.tabbrowser-tab:-moz-lwtheme { - color: inherit; - /* 0.99 opacity rquired to force an active layer, see bug #1028369 */ - opacity: 0.99; +.tabbrowser-tab[visuallyselected=true]:not(:-moz-lwtheme) { + /* overriding tabbox.css */ + color: inherit; } -.tabbrowser-tab:-moz-lwtheme:not([selected="true"]) { - opacity: 0.9; +.tabbrowser-tab[visuallyselected=true] { + /* overriding tabbox.css */ + text-shadow: inherit; } /* Remove highlight fuzz on dark themes */ @@ -1913,10 +1913,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } -.popup-notification-icon[popupid="webapps-install"] { - list-style-image: url(chrome://browser/skin/webapps-64.png); -} - .popup-notification-icon[popupid="mixed-content-blocked"] { list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png); } @@ -1988,10 +1984,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); } -#webapps-notification-icon { - list-style-image: url(chrome://browser/skin/webapps-16.png); -} - #plugins-notification-icon { list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); } diff --git a/application/palemoon/themes/osx/jar.mn b/application/palemoon/themes/osx/jar.mn index a085c5f81..28d779985 100644 --- a/application/palemoon/themes/osx/jar.mn +++ b/application/palemoon/themes/osx/jar.mn @@ -66,8 +66,6 @@ browser.jar: skin/classic/browser/urlbar-arrow.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png - skin/classic/browser/webapps-16.png - skin/classic/browser/webapps-64.png skin/classic/browser/web-notifications-icon.svg skin/classic/browser/web-notifications-tray.svg skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) diff --git a/application/palemoon/themes/osx/webapps-16.png b/application/palemoon/themes/osx/webapps-16.png Binary files differdeleted file mode 100644 index 7112ab4e4..000000000 --- a/application/palemoon/themes/osx/webapps-16.png +++ /dev/null diff --git a/application/palemoon/themes/osx/webapps-64.png b/application/palemoon/themes/osx/webapps-64.png Binary files differdeleted file mode 100644 index 7c5e48cb8..000000000 --- a/application/palemoon/themes/osx/webapps-64.png +++ /dev/null diff --git a/application/palemoon/themes/windows/browser.css b/application/palemoon/themes/windows/browser.css index b87b50732..db60a6fa7 100644 --- a/application/palemoon/themes/windows/browser.css +++ b/application/palemoon/themes/windows/browser.css @@ -2400,10 +2400,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-64.png); } -.popup-notification-icon[popupid="webapps-install"] { - list-style-image: url(chrome://browser/skin/webapps-64.png); -} - .popup-notification-icon[popupid="mixed-content-blocked"] { list-style-image: url(chrome://browser/skin/mixed-content-blocked-64.png); } @@ -2475,10 +2471,6 @@ toolbarbutton.bookmark-item[dragover="true"][open="true"] { list-style-image: url(chrome://mozapps/skin/passwordmgr/key-16.png); } -#webapps-notification-icon { - list-style-image: url(chrome://browser/skin/webapps-16.png); -} - #plugins-notification-icon { list-style-image: url(chrome://browser/skin/notification-pluginNormal.png); } diff --git a/application/palemoon/themes/windows/jar.mn b/application/palemoon/themes/windows/jar.mn index 8c0d9a5cc..ce4627e21 100644 --- a/application/palemoon/themes/windows/jar.mn +++ b/application/palemoon/themes/windows/jar.mn @@ -68,8 +68,6 @@ browser.jar: skin/classic/browser/urlbar-arrow.png skin/classic/browser/urlbar-popup-blocked.png skin/classic/browser/urlbar-history-dropmarker.png - skin/classic/browser/webapps-16.png - skin/classic/browser/webapps-64.png skin/classic/browser/web-notifications-icon.svg skin/classic/browser/web-notifications-tray.svg skin/classic/browser/notification-pluginNormal.png (../shared/plugins/notification-pluginNormal.png) diff --git a/application/palemoon/themes/windows/webapps-16.png b/application/palemoon/themes/windows/webapps-16.png Binary files differdeleted file mode 100644 index 7112ab4e4..000000000 --- a/application/palemoon/themes/windows/webapps-16.png +++ /dev/null diff --git a/application/palemoon/themes/windows/webapps-64.png b/application/palemoon/themes/windows/webapps-64.png Binary files differdeleted file mode 100644 index 7c5e48cb8..000000000 --- a/application/palemoon/themes/windows/webapps-64.png +++ /dev/null |
