[Pkg-mozext-commits] [tabmixplus] 09/34: [e10s] Follow up bug 1072980, OpenLinkWithHistory doesn't work on remote tabs in Firefox 38

[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 6e6f0414d6eaeb7c5179ebb767df1a66d96b0a9c
Author: onemen <tabmix.onemen at gmail.com>
Date:   Wed Feb 18 21:23:20 2015 +0200

    [e10s] Follow up bug 1072980, OpenLinkWithHistory doesn't work on remote tabs in Firefox 38
---
 chrome/content/minit/tablib.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 4e8ba4a..4017c87 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -967,16 +967,23 @@ var tablib = {
     };
 
     gBrowser.openLinkWithHistory = function (aTab) {
-      var {target, linkURL} = gContextMenu;
+      var {target, linkURL, principal} = gContextMenu;
       var url = tablib.getValidUrl(aTab, linkURL, target);
       if (!url)
         return;
 
-      var doc = target.ownerDocument;
-      if (typeof gContextMenu._unremotePrincipal == "function")
+      if (Tabmix.isVersion(380))
+        urlSecurityCheck(url, principal);
+      else if (typeof gContextMenu._unremotePrincipal == "function") {
+        // Firefox 26-37
+        let doc = target.ownerDocument;
         urlSecurityCheck(url, gContextMenu._unremotePrincipal(doc.nodePrincipal));
-      else
+      }
+      else {
+        // Firefox 17-25
+        let doc = target.ownerDocument;
         urlSecurityCheck(url, doc.nodePrincipal);
+      }
 
       this.duplicateTab(aTab, url);
     };

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