diff --git a/src/browser/app/profile/zen-browser.js b/src/browser/app/profile/zen-browser.js index 49f7c558f..3a4962255 100644 --- a/src/browser/app/profile/zen-browser.js +++ b/src/browser/app/profile/zen-browser.js @@ -141,4 +141,4 @@ pref('dom.security.sanitizer.enabled', true); // Zen Sidebar pref('zen.sidebar.data', "{\"data\":\n {\"p1\":{\n \"url\":\"https://web.whatsapp.com/\"\n },\n\"p2\":{\n \"url\":\"https://open.spotify.com/\",\n\"ua\": true\n },\n\"p3\": {\n \"url\": \"https://www.youtube.com/\",\n\"ua\": true\n}},\n\"index\":[\"p1\",\"p2\",\"p3\"]\n}"); pref('zen.sidebar.enabled', true); -pref('zen.sidebar.pinned', false); +pref('zen.sidebar.floating', true); diff --git a/src/browser/base/content/ZenSidebarManager.mjs b/src/browser/base/content/ZenSidebarManager.mjs index 03dccbfe9..fd8425827 100644 --- a/src/browser/base/content/ZenSidebarManager.mjs +++ b/src/browser/base/content/ZenSidebarManager.mjs @@ -30,7 +30,7 @@ var gZenBrowserManagerSidebar = { listenForPrefChanges() { Services.prefs.addObserver("zen.sidebar.data", this.handleEvent.bind(this)); Services.prefs.addObserver("zen.sidebar.enabled", this.handleEvent.bind(this)); - Services.prefs.addObserver("zen.sidebar.pinned", this.handleEvent.bind(this)); + Services.prefs.addObserver("zen.sidebar.floating", this.handleEvent.bind(this)); let sidebar = document.getElementById("zen-sidebar-web-panel"); @@ -70,7 +70,7 @@ var gZenBrowserManagerSidebar = { this.update(); this._hasChangedConfig = false; - if (Services.prefs.getBoolPref("zen.sidebar.pinned") && !this._hasRegisteredPinnedClickOutside) { + if (Services.prefs.getBoolPref("zen.sidebar.floating") && !this._hasRegisteredPinnedClickOutside) { document.addEventListener("mouseup", this._handleClickOutside.bind(this)); this._hasRegisteredPinnedClickOutside = true; } else { @@ -174,7 +174,7 @@ var gZenBrowserManagerSidebar = { _openAndGetWebPanelWrapper() { let sidebar = document.getElementById("zen-sidebar-web-panel"); sidebar.removeAttribute("hidden"); - if (Services.prefs.getBoolPref("zen.sidebar.pinned")) { + if (Services.prefs.getBoolPref("zen.sidebar.floating")) { this._setPinnedToElements(); } return sidebar; @@ -324,7 +324,7 @@ var gZenBrowserManagerSidebar = { } else { this._setPinnedToElements(); } - Services.prefs.setBoolPref("zen.sidebar.pinned", sidebar.hasAttribute("pinned")); + Services.prefs.setBoolPref("zen.sidebar.floating", sidebar.hasAttribute("pinned")); this.update(); }, diff --git a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch index f3580047a..58bde926f 100644 --- a/src/browser/base/content/navigator-toolbox-inc-xhtml.patch +++ b/src/browser/base/content/navigator-toolbox-inc-xhtml.patch @@ -1,5 +1,5 @@ diff --git a/browser/base/content/navigator-toolbox.inc.xhtml b/browser/base/content/navigator-toolbox.inc.xhtml -index fc19910726f2925505f6e71add034c82af36b63e..e371ffaa91cf38db956686cc72af60a2e840b652 100644 +index fc19910726f2925505f6e71add034c82af36b63e..a0830b01feef88bc727edef453f5add123fdfc10 100644 --- a/browser/base/content/navigator-toolbox.inc.xhtml +++ b/browser/base/content/navigator-toolbox.inc.xhtml @@ -32,10 +32,11 @@ @@ -52,7 +52,15 @@ index fc19910726f2925505f6e71add034c82af36b63e..e371ffaa91cf38db956686cc72af60a2 -@@ -505,6 +512,9 @@ +@@ -447,6 +454,7 @@ + +