From 2f16623ba1ff1740d6f1a6e97b4959c7d87012b2 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Sun, 9 Sep 2018 08:26:13 +0200 Subject: [PATCH] Revert "Minimal easy fix -- move findbar getters to tabbrowser." This reverts commit fb291846a59f9b8eaf8bba29e0d9794893e895bf. --- application/palemoon/base/content/browser.js | 17 +++++--- .../palemoon/base/content/tabbrowser.xml | 41 ------------------- 2 files changed, 12 insertions(+), 46 deletions(-) diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js index c7a2633d42..5cf43850ae 100644 --- a/application/palemoon/base/content/browser.js +++ b/application/palemoon/base/content/browser.js @@ -53,13 +53,20 @@ var gEditUIVisible = true; // Smart getter for the findbar. If you don't wish to force the creation of // the findbar, check gFindBarInitialized first. +var gFindBarInitialized = false; +XPCOMUtils.defineLazyGetter(window, "gFindBar", function() { + let XULNS = "http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"; + let findbar = document.createElementNS(XULNS, "findbar"); + findbar.id = "FindToolbar"; -this.__defineGetter__("gFindBar", function() { - return window.gBrowser.getFindBar(); -}); + let browserBottomBox = document.getElementById("browser-bottombox"); + browserBottomBox.insertBefore(findbar, browserBottomBox.firstChild); -this.__defineGetter__("gFindBarInitialized", function() { - return window.gBrowser.isFindBarInitialized(); + // Force a style flush to ensure that our binding is attached. + findbar.clientTop; + findbar.browser = gBrowser.mCurrentBrowser; + window.gFindBarInitialized = true; + return findbar; }); XPCOMUtils.defineLazyModuleGetter(this, "BrowserUtils", diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml index c140140038..0390d165c2 100644 --- a/application/palemoon/base/content/tabbrowser.xml +++ b/application/palemoon/base/content/tabbrowser.xml @@ -128,10 +128,6 @@ false - - "" - - - - - - - - - - - -