[Pkg-mozext-commits] [tabmixplus] 72/107: Incompatibility with TreeStyleTab extension, TreeStyleTab 0.16.2015111001 wrap openURI in nsBrowserAccess.prototype.__treestyletab__openURI

[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 f8ea6bd35163493d55cd950e4beea5631b7e781f
Author: onemen <tabmix.onemen at gmail.com>
Date:   Thu Nov 12 16:41:25 2015 +0200

    Incompatibility with TreeStyleTab extension, TreeStyleTab 0.16.2015111001 wrap openURI in nsBrowserAccess.prototype.__treestyletab__openURI
---
 chrome/content/minit/tablib.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 79db3bd..132c6d9 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -631,8 +631,11 @@ var tablib = { // eslint-disable-line
      * it is not likely that link in other application opened Firefox for downloading data
      */
     let fnObj = nsBrowserAccess.prototype, fnName, arg;
+    // TreeStyleTab 0.16.2015111001 wrap openURI in nsBrowserAccess.prototype.__treestyletab__openURI
+    let TSTopenURI = Tabmix.extensions.treeStyleTab &&
+        typeof fnObj.__treestyletab__openURI == "function" ? "__treestyletab__openURI" : "";
     [fnName, arg] = Tabmix.isVersion(260) ? ["_openURIInNewTab", "aIsExternal"] :
-                                            ["openURI", "isExternal"];
+                                            [TSTopenURI || "openURI", "isExternal"];
     var _openURI = Tabmix.changeCode(fnObj, "nsBrowserAccess.prototype." + fnName);
 
     var loadURIWithFlags = Tabmix.isVersion(380) ?
@@ -673,7 +676,8 @@ var tablib = { // eslint-disable-line
 
     if (Tabmix.isVersion(260)) {
       _openURI.toCode();
-      _openURI = Tabmix.changeCode(fnObj, "nsBrowserAccess.prototype.openURI");
+      fnName = "nsBrowserAccess.prototype." + (TSTopenURI || "openURI");
+      _openURI = Tabmix.changeCode(fnObj, fnName);
     }
 
     _openURI._replace(

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