[Pkg-mozext-commits] [tabmixplus] 65/107: Follow up bug 1203524 - search.xml should use Services.jsm, Clicking on search arrow button (search-go-button) does nothing in Firefox 43 (TypeError: textBox._prefBranch is undefined)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository tabmixplus.

commit 96802722d0a217fac5aee4a4755a52b21888e0f9
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Nov 11 16:20:44 2015 +0200

    Follow up bug 1203524 - search.xml should use Services.jsm, Clicking on search arrow button (search-go-button) does nothing in Firefox 43 (TypeError: textBox._prefBranch is undefined)
---
 chrome/content/minit/minit.js | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index 25ce5be..9bb8bbe 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -1204,11 +1204,14 @@ Tabmix.navToolbox = {
           _handleSearchCommand.indexOf("forceNewTab") == -1) {
       let [obj, fn] = searchLoadExt ? [esteban_torres.searchLoad_Options, "MOZhandleSearch"] :
                                       [searchbar, "handleSearchCommand"];
+      let $LF = '\n            ';
       Tabmix.changeCode(obj, "searchbar." + fn)._replace(
         'where = whereToOpenLink(aEvent, false, true);',
-        '$& \
-        var forceNewTab = where == "current" && textBox._prefBranch.getBoolPref("browser.search.openintab"); \
-        if (forceNewTab) where = "tab";'
+        '$&' + $LF +
+        'let forceNewTab = where == "current" && Services.prefs.getBoolPref("browser.search.openintab");' + $LF +
+        'if (forceNewTab) {' + $LF +
+        '  where = "tab";' + $LF +
+        '}'
       ).toCode();
     }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/tabmixplus.git