[Pkg-mozext-commits] [tabmixplus] 10/27: Incompatibility with Personas Interactive Theme Engine 1.6.5, search bar not working.

[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 2b293240b2d28939685389771d67de6c7d2548b3
Author: onemen <tabmix.onemen at gmail.com>
Date:   Tue Nov 11 23:13:22 2014 +0200

    Incompatibility with Personas Interactive Theme Engine 1.6.5, search bar not working.
---
 chrome/content/minit/minit.js | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/chrome/content/minit/minit.js b/chrome/content/minit/minit.js
index 61b6485..2e90065 100644
--- a/chrome/content/minit/minit.js
+++ b/chrome/content/minit/minit.js
@@ -1211,8 +1211,13 @@ Tabmix.navToolbox = {
     let organizeSE = "organizeSE" in window && "doSearch" in window.organizeSE;
     let [obj, fn] = searchLoadExt ? [esteban_torres.searchLoad_Options, "MOZdoSearch"] :
                                     [organizeSE ? window.organizeSE : searchbar, "doSearch"];
-    if (obj[fn].toString().indexOf("tabmixArg") > -1)
+    let fnString = obj[fn].toString();
+    if (fnString.indexOf("tabmixArg") > -1)
       return;
+
+    // Personas Interactive Theme Engine 1.6.5
+    let pIte = fnString.indexOf("BTPIServices") > -1;
+
     Tabmix.changeCode(obj, "searchbar." + fn)._replace(
       /(openUILinkIn[^\(]*\([^\)]+)(\))/,
       '$1, null, tabmixArg$2'
@@ -1229,6 +1234,12 @@ Tabmix.navToolbox = {
     )._replace(
       'var loadInBackground = prefs.getBoolPref("loadBookmarksInBackground");',
       'var loadInBackground = Tabmix.prefs.getBoolPref("loadSearchInBackground");', {check: !searchLoadExt && organizeSE}
+    )._replace(
+      /searchbar\.currentEngine/g,
+      'this.currentEngine', {check: pIte}
+    )._replace(
+      /BTPIServices/g,
+      'Services', {check: pIte}
     ).toCode();
   },
 

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