diff --git a/application/basilisk/app/profile/basilisk.js b/application/basilisk/app/profile/basilisk.js index 1a4c2a63a6..0bcacef786 100644 --- a/application/basilisk/app/profile/basilisk.js +++ b/application/basilisk/app/profile/basilisk.js @@ -457,6 +457,16 @@ pref("dom.disable_window_move_resize", false); // prevent JS from monkeying with window focus, etc pref("dom.disable_window_flip", true); +// Whether performance.GetEntries* will contain an entry for the active document +// Disabled by default in Basilisk (unlike in UXP) since it can be used for +// tracking/profiling. +pref("dom.enable_performance_navigation_timing", false); + +// This pref controls whether PerformanceObserver is enabled or not. +// We enable it by default, unlike UXP and Pale Moon because several sites are +// beginning to expect this to be present. +pref("dom.enable_performance_observer", true); + // popups.policy 1=allow,2=reject pref("privacy.popups.policy", 1); pref("privacy.popups.usecustom", true); diff --git a/application/basilisk/branding/shared/uaoverrides.inc b/application/basilisk/branding/shared/uaoverrides.inc index cffa9d1318..3d51febca9 100644 --- a/application/basilisk/branding/shared/uaoverrides.inc +++ b/application/basilisk/branding/shared/uaoverrides.inc @@ -9,7 +9,7 @@ #define GK_SLICE Gecko/20100101 #define FX_SLICE Firefox/@GK_VERSION@ -#define PALE_MOON_VERSION 32.0.1 +#define PALE_MOON_VERSION 32.4.1 #define PALE_MOON_SLICE PaleMoon/@PALE_MOON_VERSION@ // %OS_SLICE% macro is resolved at runtime, see MoonchildProductions/UXP/issues/1473 @@ -56,7 +56,6 @@ pref("@GUAO_PREF@.firefox.com","Mozilla/5.0 (%OS_SLICE% rv:@UXP_VERSION@) @UXP_D pref("@GUAO_PREF@.mozilla.org","Mozilla/5.0 (%OS_SLICE% rv:@UXP_VERSION@) @UXP_DATE_SLICE@ @APP_SLICE@"); pref("@GUAO_PREF@.mozilla.com","Mozilla/5.0 (%OS_SLICE% rv:@UXP_VERSION@) @UXP_DATE_SLICE@ @APP_SLICE@"); pref("@GUAO_PREF@.github.com","Mozilla/5.0 (%OS_SLICE% rv:@UXP_VERSION@) @UXP_DATE_SLICE@ @APP_SLICE@"); -pref("@GUAO_PREF@.spotify.com","Mozilla/5.0 (%OS_SLICE% rv:@UXP_VERSION@) @UXP_DATE_SLICE@ @APP_SLICE@"); pref("@GUAO_PREF@.twitter.com","Mozilla/5.0 (%OS_SLICE% rv:@UXP_VERSION@) @UXP_DATE_SLICE@ @APP_SLICE@"); pref("@GUAO_PREF@.zoho.com","Mozilla/5.0 (%OS_SLICE% rv:@UXP_VERSION@) @UXP_DATE_SLICE@ @APP_SLICE@"); @@ -65,9 +64,8 @@ pref("@GUAO_PREF@.humblebundle.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @G pref("@GUAO_PREF@.privat24.ua","Mozilla/5.0 (%OS_SLICE% rv:38.0) @GK_SLICE@ Firefox/38.0"); pref("@GUAO_PREF@.citi.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ Firefox/68.0 SeaMonkey/2.53.12"); pref("@GUAO_PREF@.facebook.com","Mozilla/5.0 (%OS_SLICE% rv:68.0) @GK_SLICE@ Firefox/68.0 @APP_SLICE@"); -pref("@GUAO_PREF@.netflix.com","Mozilla/5.0 (Windows NT 6.1; rv:45.9) @GK_SLICE@ Firefox/45.9"); -pref("@GUAO_PREF@.netflximg.net","Mozilla/5.0 (Windows NT 6.1; rv:45.9) @GK_SLICE@ Firefox/45.9"); pref("@GUAO_PREF@.mewe.com", "Mozilla/5.0 (%OS_SLICE% rv:102.0) Gecko/20100101 Firefox/102.0"); +pref("@GUAO_PREF@.spotify.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@"); // UA-sniffing domains that are "app/vendor-specific" and do not like Basilisk pref("@GUAO_PREF@.web.whatsapp.com","Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36"); @@ -85,7 +83,7 @@ pref("@GUAO_PREF@.ldoceonline.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK pref("@GUAO_PREF@.yuku.com","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @FX_SLICE@ @APP_SLICE@"); // Domains Basilisk overrides that are not in the Pale Moon overrides -pref("@GUAO_PREF@.slack.com","Mozilla/5.0 (%OS_SLICE% rv:100.0) @GK_SLICE@ Firefox/100.0 @APP_SLICE@"); +pref("@GUAO_PREF@.slack.com","Mozilla/5.0 (%OS_SLICE% rv:120.0) @GK_SLICE@ Firefox/120.0 @APP_SLICE@"); // There are multiple addons on the Pale Moon addons site that work with Basilisk that are not listed on the Basilisk addons site. pref("@GUAO_PREF@.addons.palemoon.org","Mozilla/5.0 (%OS_SLICE% rv:@GK_VERSION@) @GK_SLICE@ @UXP_VERSION_SLICE@ @FX_SLICE@ @PALE_MOON_SLICE@"); diff --git a/application/basilisk/components/preferences/in-content/content.xul b/application/basilisk/components/preferences/in-content/content.xul index fac864411d..b2e18d79d2 100644 --- a/application/basilisk/components/preferences/in-content/content.xul +++ b/application/basilisk/components/preferences/in-content/content.xul @@ -22,6 +22,16 @@ + + + +#ifdef MOZ_WEBRTC + +#endif - - - -

mozscreenshots

- -

- This page was generated by mozscreenshots -

- - - -

Welcome Humans! We invite others to keep the Manifesto’s principles; use the creation delivery and commitment. Advancing the Manifesto. We have shiny metal posteriors which should not be bitten. And they have distilled a public benefit is committed to use Mozilla project one basic and communities of modern life.

- -

Robots have distilled a balance between commercial aspects of life.

- -

Robots may not they have shown in education communication collaboration business entertainment and other people to pursue; speak to continue; and opportunity are many different ways to benefit the public benefit the Manifesto’s principles; build and motivate us and trademarks infrastructure funds and trademarks infrastructure funds and enable open-source technologies and provide a whole.

- -

And they have seen things you people who believe that Mozilla Manifesto. We are to: articulate a vision of individual human being to benefit the lives of these efforts we will: build and promote models for creating economic value for the Internet. We create world-class open and anticipate the Mozilla Manifesto There are Your Plastic Pal Who's Fun To Be With

- -

Some Foundation to advance this vision of individual human being or not deeply involved in groups and promote models for the Manifesto principles will not come to support the Mozilla Foundation Pledge The Mozilla Manifesto in its activities. People are to: articulate a set of consumer products that support the Internet is a human being or not be treated as individuals working together in the development of the Internet open and with goodwill!Specifically we believe that we will: build and society as a public good as a result of the lives of collaborative activities. Specifically we have seen things you people acting as optional. Individuals must not come to continue to develop new ways of the Internet are fundamental and with us to ensure that openness innovation and very effective way that the Manifesto There are many benefits; a global public benefit; and society as optional.

- -

We have metal posteriors which should not deeply involved in a reality. Individuals must remain open source software promotes the Internet is a balance between commercial profit and within the Mozilla Corporation. Invitation The Internet are key to join us to life on their own. The Internet a whole. The Internet as a vision of the Mozilla contributors proud of time attention and motivate us and provide a reality.

- - - - diff --git a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html deleted file mode 100644 index de83106662..0000000000 --- a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/permissionPrompts.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Permission Prompts - - - - - - - - - Install Add-On -
- - - -
- - - - - diff --git a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png deleted file mode 100644 index 1c4899aaf7..0000000000 Binary files a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/robot.png and /dev/null differ diff --git a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/white_theme.png b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/white_theme.png deleted file mode 100644 index 6b0c501a1b..0000000000 Binary files a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/lib/white_theme.png and /dev/null differ diff --git a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/moz.build b/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/moz.build deleted file mode 100644 index 60fcceafec..0000000000 --- a/application/basilisk/tools/mozscreenshots/mozscreenshots/extension/moz.build +++ /dev/null @@ -1,16 +0,0 @@ -# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -XPI_NAME = 'mozscreenshots' - -JAR_MANIFESTS += ['jar.mn'] - -USE_EXTENSION_MANIFEST = True -NO_JS_MANIFEST = True - -FINAL_TARGET_PP_FILES += [ - 'bootstrap.js', - 'install.rdf', -] diff --git a/application/basilisk/tools/mozscreenshots/permissionPrompts/browser.ini b/application/basilisk/tools/mozscreenshots/permissionPrompts/browser.ini deleted file mode 100644 index 5cbe196c84..0000000000 --- a/application/basilisk/tools/mozscreenshots/permissionPrompts/browser.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -subsuite = screenshots -support-files = - ../head.js - -[browser_permissionPrompts.js] diff --git a/application/basilisk/tools/mozscreenshots/permissionPrompts/browser_permissionPrompts.js b/application/basilisk/tools/mozscreenshots/permissionPrompts/browser_permissionPrompts.js deleted file mode 100644 index af63217f2d..0000000000 --- a/application/basilisk/tools/mozscreenshots/permissionPrompts/browser_permissionPrompts.js +++ /dev/null @@ -1,16 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* import-globals-from ../head.js */ - -"use strict"; - -add_task(function* capture() { - if (!shouldCapture()) { - return; - } - let sets = ["LightweightThemes", "PermissionPrompts"]; - - yield TestRunner.start(sets, "permissionPrompts"); -}); diff --git a/application/basilisk/tools/mozscreenshots/preferences/browser.ini b/application/basilisk/tools/mozscreenshots/preferences/browser.ini deleted file mode 100644 index 975d916815..0000000000 --- a/application/basilisk/tools/mozscreenshots/preferences/browser.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -subsuite = screenshots -support-files = - ../head.js - -[browser_preferences.js] diff --git a/application/basilisk/tools/mozscreenshots/preferences/browser_preferences.js b/application/basilisk/tools/mozscreenshots/preferences/browser_preferences.js deleted file mode 100644 index c590f194fe..0000000000 --- a/application/basilisk/tools/mozscreenshots/preferences/browser_preferences.js +++ /dev/null @@ -1,16 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* import-globals-from ../head.js */ - -"use strict"; - -add_task(function* capture() { - if (!shouldCapture()) { - return; - } - let sets = ["Preferences"]; - - yield TestRunner.start(sets, "preferences"); -}); diff --git a/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini b/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini deleted file mode 100644 index 628520b23f..0000000000 --- a/application/basilisk/tools/mozscreenshots/primaryUI/browser.ini +++ /dev/null @@ -1,6 +0,0 @@ -[DEFAULT] -subsuite = screenshots -support-files = - ../head.js - -[browser_primaryUI.js] diff --git a/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js b/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js deleted file mode 100644 index 6d0eaa1d66..0000000000 --- a/application/basilisk/tools/mozscreenshots/primaryUI/browser_primaryUI.js +++ /dev/null @@ -1,18 +0,0 @@ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* import-globals-from ../head.js */ - -"use strict"; - -add_task(function* capture() { - if (!shouldCapture()) { - return; - } - - requestLongerTimeout(20); - - let sets = ["TabsInTitlebar", "Tabs", "WindowSize", "Toolbars", "LightweightThemes"]; - yield TestRunner.start(sets, "primaryUI"); -}); diff --git a/application/palemoon/app/profile/palemoon.js b/application/palemoon/app/profile/palemoon.js index abaa645d6c..e9324df95d 100644 --- a/application/palemoon/app/profile/palemoon.js +++ b/application/palemoon/app/profile/palemoon.js @@ -500,9 +500,6 @@ pref("browser.bookmarks.autoExportHTML", false); // 0: no backups created (and deletes all existing backups) pref("browser.bookmarks.max_backups", 10); -// Whether menu should close after Ctrl-click, middle-click, etc. -pref("browser.bookmarks.openInTabClosesMenu", true); - // Scripts & Windows prefs pref("dom.disable_open_during_load", true); pref("javascript.options.showInConsole", true); diff --git a/application/palemoon/base/content/browser-menubar.inc b/application/palemoon/base/content/browser-menubar.inc index 0680876f6b..8a93e3a55e 100644 --- a/application/palemoon/base/content/browser-menubar.inc +++ b/application/palemoon/base/content/browser-menubar.inc @@ -371,7 +371,6 @@ placespopup="true" context="placesContext" openInTabs="children" - onmouseup="BookmarksEventHandler.onMouseUp(event);" oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" onpopupshowing="PlacesCommandHook.updateBookmarkAllTabsCommand(); diff --git a/application/palemoon/base/content/browser-places.js b/application/palemoon/base/content/browser-places.js index a420d96650..f58b4118e3 100644 --- a/application/palemoon/base/content/browser-places.js +++ b/application/palemoon/base/content/browser-places.js @@ -767,46 +767,17 @@ HistoryMenu.prototype = { * Functions for handling events in the Bookmarks Toolbar and menu. */ var BookmarksEventHandler = { - - /** - * Handler for mouseUp event for an item in the bookmarks toolbar or menu. - * When items are middle-clicked (or clicked with modifier), check if the - * menu should remain open. - * @param aEvent - * DOMEvent for the click - */ - - onMouseUp(aEvent) { - // Handles left-click with modifier if not browser.bookmarks.openInTabClosesMenu. - if (aEvent.button != 0 || - Services.prefs.getBoolPref("browser.bookmarks.openInTabClosesMenu", true)) - return; - let target = aEvent.originalTarget; - if (target.tagName != "menuitem") - return; -#ifdef XP_MACOSX - var modifKey = aEvent.metaKey; -#else - var modifKey = aEvent.ctrlKey; -#endif - // Don't keep menu open for 'Open all in Tabs'. - if (modifKey && !target.classList.contains("openintabs-menuitem")) { - target.setAttribute("closemenu", "none"); - } - }, - /** * Handler for click event for an item in the bookmarks toolbar or menu. * Menus and submenus from the folder buttons bubble up to this handler. * Left-click is handled in the onCommand function. * When items are middle-clicked (or clicked with modifier), open in tabs. - * If the click came through a menu, close the menu unless preffed otherwise. + * If the click came through a menu, close the menu. * @param aEvent * DOMEvent for the click * @param aView * The places view which aEvent should be associated with. */ - onClick: function(aEvent, aView) { // Only handle middle-click or left-click with modifiers. var modifKey = aEvent.ctrlKey || aEvent.shiftKey; @@ -815,23 +786,19 @@ var BookmarksEventHandler = { } var target = aEvent.originalTarget; - // If this event bubbled up from a menu or menuitem, - // close the menus if browser.bookmarks.openInTabClosesMenu. - if ((Services.prefs.getBoolPref("browser.bookmarks.openInTabClosesMenu", true) && - target.tagName == "menuitem") || - target.tagName == "menu" || - target.classList.contains("openintabs-menuitem")) { - closeMenus(aEvent.target); - } - // Command already precesssed so remove any closemenu attr set in onMouseUp. - if (aEvent.button == 0 && - target.tagName == "menuitem" && - target.getAttribute("closemenu") == "none") { - // On Mac we need to extend when we remove the flag, to avoid any pre-close - // animations. - setTimeout(() => { - target.removeAttribute("closemenu"); - }, 500); + // If this event bubbled up from a menu or menuitem, close the menus. + // Do this before opening tabs, to avoid hiding the open tabs confirm-dialog. + if (target.localName == "menu" || target.localName == "menuitem") { + for (node = target.parentNode; node; node = node.parentNode) { + if (node.localName == "menupopup") { + node.hidePopup(); + } else if (node.localName != "menu" && + node.localName != "splitmenu" && + node.localName != "hbox" && + node.localName != "vbox" ) { + break; + } + } } if (target._placesNode && PlacesUtils.nodeIsContainer(target._placesNode)) { diff --git a/application/palemoon/base/content/browser.xul b/application/palemoon/base/content/browser.xul index 027c7a5177..9575199813 100644 --- a/application/palemoon/base/content/browser.xul +++ b/application/palemoon/base/content/browser.xul @@ -548,7 +548,6 @@ placespopup="true" context="placesContext" openInTabs="children" - onmouseup="BookmarksEventHandler.onMouseUp(event);" oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" onclick="event.stopPropagation(); BookmarksEventHandler.onClick(event, this.parentNode._placesView);" @@ -705,7 +704,6 @@ - - - + + + + + + + + + +