From 3dbcd0de3aea5fec3ad8179d85b8b6386162f2d1 Mon Sep 17 00:00:00 2001 From: wicknix <39230578+wicknix@users.noreply.github.com> Date: Mon, 22 Jul 2019 23:55:50 -0500 Subject: Add space to MOZ_APP_DISPLAYNAME PaleMoon now becomes Pale Moon --- application/palemoon/branding/official/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/palemoon/branding/official/configure.sh b/application/palemoon/branding/official/configure.sh index a9818b4a7..8943f5819 100644 --- a/application/palemoon/branding/official/configure.sh +++ b/application/palemoon/branding/official/configure.sh @@ -2,5 +2,5 @@ # 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/. -MOZ_APP_DISPLAYNAME=PaleMoon +MOZ_APP_DISPLAYNAME="Pale Moon" # MOZ_UA_BUILDID=20100101 -- cgit v1.2.3 From 155a5262d07ab992fb18ebb3eb254f555b6564d2 Mon Sep 17 00:00:00 2001 From: wicknix <39230578+wicknix@users.noreply.github.com> Date: Mon, 22 Jul 2019 23:57:12 -0500 Subject: Add space to MOZ_APP_DISPLAYNAME NewMoon now becomes New Moon --- application/palemoon/branding/unofficial/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/palemoon/branding/unofficial/configure.sh b/application/palemoon/branding/unofficial/configure.sh index 05a1e1b87..c03b8382a 100644 --- a/application/palemoon/branding/unofficial/configure.sh +++ b/application/palemoon/branding/unofficial/configure.sh @@ -2,4 +2,4 @@ # 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/. -MOZ_APP_DISPLAYNAME=NewMoon +MOZ_APP_DISPLAYNAME="New Moon" -- cgit v1.2.3 From 94605c16951c199a3de5abbe5e8869c03209afb9 Mon Sep 17 00:00:00 2001 From: wicknix <39230578+wicknix@users.noreply.github.com> Date: Mon, 22 Jul 2019 23:58:18 -0500 Subject: Add space to MOZ_APP_DISPLAYNAME PaleMoon becomes Pale Moon --- application/palemoon/branding/unstable/configure.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'application') diff --git a/application/palemoon/branding/unstable/configure.sh b/application/palemoon/branding/unstable/configure.sh index 814133dfa..8943f5819 100644 --- a/application/palemoon/branding/unstable/configure.sh +++ b/application/palemoon/branding/unstable/configure.sh @@ -2,5 +2,5 @@ # 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/. -MOZ_APP_DISPLAYNAME=Palemoon +MOZ_APP_DISPLAYNAME="Pale Moon" # MOZ_UA_BUILDID=20100101 -- cgit v1.2.3 From 9cb962ac4394cccc098235dc82d3cc94934d06bd Mon Sep 17 00:00:00 2001 From: wicknix <39230578+wicknix@users.noreply.github.com> Date: Tue, 23 Jul 2019 18:43:03 -0500 Subject: Add red moon icon to MacOS for unstable builds Replaces grey moon which is supposed to be used for unofficial "New Moon" builds. --- application/palemoon/branding/unstable/firefox.icns | Bin 12079 -> 59809 bytes 1 file changed, 0 insertions(+), 0 deletions(-) (limited to 'application') diff --git a/application/palemoon/branding/unstable/firefox.icns b/application/palemoon/branding/unstable/firefox.icns index 117ddb195..3df606a01 100644 Binary files a/application/palemoon/branding/unstable/firefox.icns and b/application/palemoon/branding/unstable/firefox.icns differ -- cgit v1.2.3 From 365133b9aa37372d5b40b67e03099255ca616177 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Thu, 25 Jul 2019 12:34:59 +0200 Subject: Update default bookmark icons. --- application/palemoon/locales/generic/profile/bookmarks.html.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'application') diff --git a/application/palemoon/locales/generic/profile/bookmarks.html.in b/application/palemoon/locales/generic/profile/bookmarks.html.in index 96270641a..90e3adfe9 100644 --- a/application/palemoon/locales/generic/profile/bookmarks.html.in +++ b/application/palemoon/locales/generic/profile/bookmarks.html.in @@ -11,9 +11,9 @@

@bookmarks_toolbarfolder@

@bookmarks_toolbarfolder_description@

-

Pale Moon -
Pale Moon forum -
F.A.Q. -
Release notes +
Pale Moon +
Pale Moon forum +
F.A.Q. +
Release notes

-- cgit v1.2.3 From 9b0ff0e8bcc2bf9f6d18be4e6b7c956fbfd831ee Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 26 Jul 2019 16:09:05 +0200 Subject: Add UI preference for overall vertical smooth scrolling speed (as a percentage). Resolves #1147. --- application/palemoon/components/preferences/advanced.xul | 9 +++++++++ .../locales/en-US/chrome/browser/preferences/advanced.dtd | 2 ++ 2 files changed, 11 insertions(+) (limited to 'application') diff --git a/application/palemoon/components/preferences/advanced.xul b/application/palemoon/components/preferences/advanced.xul index 34998c1b8..e5f3bb160 100644 --- a/application/palemoon/components/preferences/advanced.xul +++ b/application/palemoon/components/preferences/advanced.xul @@ -106,6 +106,8 @@ + + #ifdef HAVE_SHELL_SERVICE @@ -445,6 +447,13 @@ preference="general.smoothScroll.scrollbars.durationMaxMS"/> + + + diff --git a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd index dcb7b0e90..bb8dd12d2 100644 --- a/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd +++ b/application/palemoon/locales/en-US/chrome/browser/preferences/advanced.dtd @@ -147,3 +147,5 @@ + + -- cgit v1.2.3 From 93ceb82819eb2ed38f35d222675211bf03dde9e0 Mon Sep 17 00:00:00 2001 From: Ryan Fox Date: Sat, 27 Jul 2019 08:27:38 +0000 Subject: Issue #1156 - Location Bar Preferences Checkboxes Signed-off-by: Ryan Fox --- .../palemoon/components/preferences/privacy.js | 30 ---------------------- .../palemoon/components/preferences/privacy.xul | 3 --- 2 files changed, 33 deletions(-) (limited to 'application') diff --git a/application/palemoon/components/preferences/privacy.js b/application/palemoon/components/preferences/privacy.js index 05c2f9b8a..e2a871acc 100644 --- a/application/palemoon/components/preferences/privacy.js +++ b/application/palemoon/components/preferences/privacy.js @@ -298,36 +298,6 @@ var gPrivacyPane = { // HISTORY - /** - * Read the location bar enabled and suggestion prefs - * @return Int value for suggestion menulist - */ - readSuggestionPref: function PPP_readSuggestionPref() - { - let getVal = function(aPref) - document.getElementById("browser.urlbar." + aPref).value; - - // Suggest nothing if autocomplete is not enabled - if (!getVal("autocomplete.enabled")) - return -1; - - // Bottom 2 bits of default.behavior specify history/bookmark - return getVal("default.behavior") & 3; - }, - - /** - * Update browser.urlbar.autocomplete.enabled when a - * browser.urlbar.suggest.* pref is changed from the ui. - */ - writeSuggestionPref: function PPP_writeSuggestionPref() { - let getVal = (aPref) => { - return document.getElementById("browser.urlbar.suggest." + aPref).value; - } - // autocomplete.enabled is true if any of the suggestions is true - let enabled = ["history", "bookmark", "openpage"].map(getVal).some(v => v); - Services.prefs.setBoolPref("browser.urlbar.autocomplete.enabled", enabled); - }, - /* * Preferences: * diff --git a/application/palemoon/components/preferences/privacy.xul b/application/palemoon/components/preferences/privacy.xul index bdb227c63..d2f8106d1 100644 --- a/application/palemoon/components/preferences/privacy.xul +++ b/application/palemoon/components/preferences/privacy.xul @@ -254,15 +254,12 @@ -- cgit v1.2.3 From 3170ee7692ef30ee67f26219b19b2b4115c01a56 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 28 Jul 2019 21:24:32 +0200 Subject: Hide and disable open_all/cut/copy/delete/properties when opening bookmarks/history context menu with no selection This resolves #882 (by not offering options that can't be used) --- .../places/content/browserPlacesViews.js | 15 +++- .../components/places/content/controller.js | 86 +++++++++++----------- .../components/places/content/placesOverlay.xul | 11 ++- .../components/places/content/sidebarUtils.js | 2 +- 4 files changed, 61 insertions(+), 53 deletions(-) (limited to 'application') diff --git a/application/palemoon/components/places/content/browserPlacesViews.js b/application/palemoon/components/places/content/browserPlacesViews.js index eec7274a4..8b90dd280 100644 --- a/application/palemoon/components/places/content/browserPlacesViews.js +++ b/application/palemoon/components/places/content/browserPlacesViews.js @@ -109,8 +109,15 @@ PlacesViewBase.prototype = { get selectedNode() { if (this._contextMenuShown) { - let popup = document.popupNode; - return popup._placesNode || popup.parentNode._placesNode || null; + let anchor = this._contextMenuShown.triggerNode; + if (!anchor) + return null; + + if (anchor._placesNode) + return this._rootElt == anchor ? null : anchor._placesNode; + + anchor = anchor.parentNode; + return this._rootElt == anchor ? null : (anchor._placesNode || null); } return null; }, @@ -176,13 +183,13 @@ PlacesViewBase.prototype = { }, buildContextMenu: function PVB_buildContextMenu(aPopup) { - this._contextMenuShown = true; + this._contextMenuShown = aPopup; window.updateCommands("places"); return this.controller.buildContextMenu(aPopup); }, destroyContextMenu: function PVB_destroyContextMenu(aPopup) { - this._contextMenuShown = false; + this._contextMenuShown = null; }, _cleanPopup: function PVB_cleanPopup(aPopup, aDelay) { diff --git a/application/palemoon/components/places/content/controller.js b/application/palemoon/components/places/content/controller.js index 7f5f7f652..d09827163 100644 --- a/application/palemoon/components/places/content/controller.js +++ b/application/palemoon/components/places/content/controller.js @@ -333,20 +333,6 @@ PlacesController.prototype = { return ip != null && (isPaste || ip.isTag != true); }, - /** - * Determines whether or not the root node for the view is selected - */ - rootNodeIsSelected: function PC_rootNodeIsSelected() { - var nodes = this._view.selectedNodes; - var root = this._view.result.root; - for (var i = 0; i < nodes.length; ++i) { - if (nodes[i] == root) - return true; - } - - return false; - }, - /** * Looks at the data on the clipboard to see if it is paste-able. * Paste-able data is: @@ -400,7 +386,7 @@ PlacesController.prototype = { * Gathers information about the selected nodes according to the following * rules: * "link" node is a URI - * "bookmark" node is a bookamrk + * "bookmark" node is a bookmark * "livemarkChild" node is a child of a livemark * "tagChild" node is a child of a tag * "folder" node is a folder @@ -414,15 +400,10 @@ PlacesController.prototype = { * node are set on its corresponding object as properties. * Notes: * 1) This can be slow, so don't call it anywhere performance critical! - * 2) A single-object array corresponding the root node is returned if - * there's no selection. */ _buildSelectionMetadata: function PC__buildSelectionMetadata() { var metadata = []; - var root = this._view.result.root; var nodes = this._view.selectedNodes; - if (nodes.length == 0) - nodes.push(root); // See the second note above for (var i = 0; i < nodes.length; i++) { var nodeData = {}; @@ -501,10 +482,23 @@ PlacesController.prototype = { */ _shouldShowMenuItem: function PC__shouldShowMenuItem(aMenuItem, aMetaData) { var selectiontype = aMenuItem.getAttribute("selectiontype"); - if (selectiontype == "multiple" && aMetaData.length == 1) + if (!selectiontype) { + selectiontype = "single|multiple"; + } + var selectionTypes = selectiontype.split("|"); + if (selectionTypes.indexOf("any") != -1) { + return true; + } + var count = aMetaData.length; + if (count > 1 && selectionTypes.indexOf("multiple") == -1) return false; - if (selectiontype == "single" && aMetaData.length != 1) + if (count == 1 && selectionTypes.indexOf("single") == -1) return false; + // NB: if there is no selection, we show the item if (and only if) + // the selectiontype includes 'none' - the metadata list will be + // empty so none of the other criteria will apply anyway. + if (count == 0) + return selectionTypes.indexOf("none") != -1; var forceHideAttr = aMenuItem.getAttribute("forcehideselection"); if (forceHideAttr) { @@ -551,9 +545,11 @@ PlacesController.prototype = { * 1) The "selectiontype" attribute may be set on a menu-item to "single" * if the menu-item should be visible only if there is a single node * selected, or to "multiple" if the menu-item should be visible only if - * multiple nodes are selected. If the attribute is not set or if it is - * set to an invalid value, the menu-item may be visible for both types of - * selection. + * multiple nodes are selected, or to "none" if the menuitems should be + * visible for if there are no selected nodes, or to a |-separated + * combination of these. + * If the attribute is not set or set to an invalid value, the menu-item + * may be visible irrespective of the selection. * 2) The "selection" attribute may be set on a menu-item to the various * meta-data rules for which it may be visible. The rules should be * separated with the | character. @@ -584,7 +580,7 @@ PlacesController.prototype = { var separator = null; var visibleItemsBeforeSep = false; - var anyVisible = false; + var usableItemCount = 0; for (var i = 0; i < aPopup.childNodes.length; ++i) { var item = aPopup.childNodes[i]; if (item.localName != "menuseparator") { @@ -598,12 +594,13 @@ PlacesController.prototype = { (!/tree/i.test(this._view.localName) || ip); var hideIfPrivate = item.getAttribute("hideifprivatebrowsing") == "true" && PrivateBrowsingUtils.isWindowPrivate(window); - item.hidden = hideIfNoIP || hideIfPrivate || hideParentFolderItem || - !this._shouldShowMenuItem(item, metadata); + var shouldHideItem = hideIfNoIP || hideIfPrivate || hideParentFolderItem || + !this._shouldShowMenuItem(item, metadata); + item.hidden = item.disabled = shouldHideItem; if (!item.hidden) { visibleItemsBeforeSep = true; - anyVisible = true; + usableItemCount++; // Show the separator above the menu-item if any if (separator) { @@ -627,21 +624,21 @@ PlacesController.prototype = { } // Set Open Folder/Links In Tabs items enabled state if they're visible - if (anyVisible) { + if (usableItemCount > 0) { var openContainerInTabsItem = document.getElementById("placesContext_openContainer:tabs"); - if (!openContainerInTabsItem.hidden && this._view.selectedNode && - PlacesUtils.nodeIsContainer(this._view.selectedNode)) { - openContainerInTabsItem.disabled = - !PlacesUtils.hasChildURIs(this._view.selectedNode); - } - else { - // see selectiontype rule in the overlay - var openLinksInTabsItem = document.getElementById("placesContext_openLinks:tabs"); - openLinksInTabsItem.disabled = openLinksInTabsItem.hidden; + if (!openContainerInTabsItem.hidden) { + var containerToUse = this._view.selectedNode || this._view.result.root; + if (PlacesUtils.nodeIsContainer(containerToUse)) { + if (!PlacesUtils.hasChildURIs(containerToUse, true)) { + openContainerInTabsItem.disabled = true; + // Ensure that we don't display the menu if nothing is enabled: + usableItemCount--; + } + } } } - return anyVisible; + return usableItemCount > 0; }, /** @@ -707,10 +704,15 @@ PlacesController.prototype = { */ openSelectionInTabs: function PC_openLinksInTabs(aEvent) { var node = this._view.selectedNode; + var nodes = this._view.selectedNodes; + // In the case of no selection, open the root node: + if (!node && !nodes.length) { + node = this._view.result.root; + } if (node && PlacesUtils.nodeIsContainer(node)) - PlacesUIUtils.openContainerNodeInTabs(this._view.selectedNode, aEvent, this._view); + PlacesUIUtils.openContainerNodeInTabs(node, aEvent, this._view); else - PlacesUIUtils.openURINodesInTabs(this._view.selectedNodes, aEvent, this._view); + PlacesUIUtils.openURINodesInTabs(nodes, aEvent, this._view); }, /** diff --git a/application/palemoon/components/places/content/placesOverlay.xul b/application/palemoon/components/places/content/placesOverlay.xul index dd4d50f01..745990a9c 100644 --- a/application/palemoon/components/places/content/placesOverlay.xul +++ b/application/palemoon/components/places/content/placesOverlay.xul @@ -149,20 +149,20 @@ command="placesCmd_new:bookmark" label="&cmd.new_bookmark.label;" accesskey="&cmd.new_bookmark.accesskey;" - selection="any" + selectiontype="any" hideifnoinsertionpoint="true"/> + accesskey="©Cmd.accesskey;"/>