[Pkg-mozext-commits] [tabmixplus] 49/73: Change tablib.getValidUrl to get its arguments directly from gContextMenu

[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 f6a536dc2c8ccb4e1a68981ef379996a5fbc692f
Author: onemen <tabmix.onemen at gmail.com>
Date:   Fri Apr 22 13:55:51 2016 +0300

    Change tablib.getValidUrl to get its arguments directly from gContextMenu
---
 chrome/content/click/click.js  |  3 +--
 chrome/content/minit/tablib.js | 27 ++++++++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/chrome/content/click/click.js b/chrome/content/click/click.js
index 478d8c3..86e37d1 100644
--- a/chrome/content/click/click.js
+++ b/chrome/content/click/click.js
@@ -646,8 +646,7 @@ var TabmixContext = {
           onLink && (Tabmix.prefs.getBoolPref("openLinkHere") ||
                      Tabmix.prefs.getBoolPref("openInverseLink") ||
                      Tabmix.prefs.getBoolPref("linkWithHistory"))) {
-        let {target, linkURL} = gContextMenu;
-        gContextMenu.tabmixLinkURL = tablib.getValidUrl(linkURL, target);
+        gContextMenu.tabmixLinkURL = tablib.getValidUrl();
       }
 
       var freezeTabMenu = document.getElementById("tm-content-freezeTab");
diff --git a/chrome/content/minit/tablib.js b/chrome/content/minit/tablib.js
index 63d7683..24a9e52 100644
--- a/chrome/content/minit/tablib.js
+++ b/chrome/content/minit/tablib.js
@@ -1054,20 +1054,19 @@ var tablib = { // eslint-disable-line
     };
 
     gBrowser.openLinkWithHistory = function() {
-      var {target, linkURL, principal} = gContextMenu;
-      var url = tablib.getValidUrl(linkURL, target);
+      var url = tablib.getValidUrl();
       if (!url)
         return;
 
       if (Tabmix.isVersion(380))
-        urlSecurityCheck(url, principal);
+        urlSecurityCheck(url, gContextMenu.principal);
       else if (typeof gContextMenu._unremotePrincipal == "function") {
         // Firefox 26-37
-        let doc = target.ownerDocument;
+        let doc = gContextMenu.target.ownerDocument;
         urlSecurityCheck(url, gContextMenu._unremotePrincipal(doc.nodePrincipal));
       } else {
         // Firefox 17-25
-        let doc = target.ownerDocument;
+        let doc = gContextMenu.target.ownerDocument;
         urlSecurityCheck(url, doc.nodePrincipal);
       }
 
@@ -1075,8 +1074,7 @@ var tablib = { // eslint-disable-line
     };
 
     gBrowser.openInverseLink = function(event) {
-      var {target, linkURL} = gContextMenu;
-      var url = tablib.getValidUrl(linkURL, target);
+      var url = tablib.getValidUrl();
       if (!url)
         return;
 
@@ -1087,8 +1085,7 @@ var tablib = { // eslint-disable-line
     };
 
     tablib.openLinkInCurrent = function() {
-      var {target, linkURL} = gContextMenu;
-      var url = tablib.getValidUrl(linkURL, target);
+      var url = tablib.getValidUrl();
       if (!url)
         return;
 
@@ -1097,7 +1094,11 @@ var tablib = { // eslint-disable-line
       gContextMenu.openLinkInCurrent();
     };
 
-    tablib.getValidUrl = function(url, target) {
+    tablib.getValidUrl = function() {
+      if (!gContextMenu) {
+        return null;
+      }
+      let {target, linkURL} = gContextMenu;
       // valid urls don't contain spaces ' '; if we have a space it isn't a valid url.
       // Also disallow dropping javascript: or data: urls--bail out
       let isValid = function(aUrl) {
@@ -1112,17 +1113,17 @@ var tablib = { // eslint-disable-line
           typeof gContextMenu.tabmixLinkURL != "undefined")
         return gContextMenu.tabmixLinkURL;
 
-      if (!isValid(url)) {
+      if (!isValid(linkURL)) {
         let json = {button: 0, shiftKey: false, ctrlKey: false, metaKey: false,
                     altKey: false, target: {},
                     tabmix_openLinkWithHistory: true};
         // we only get here when it is safe to use contentWindowAsCPOW
         // see TabmixContext.updateMainContextMenu
         let result = Tabmix.ContentClick.getParamsForLink(json,
-              target, url, browser, gBrowser.selectedBrowser._contentWindow);
+              target, linkURL, browser, gBrowser.selectedBrowser._contentWindow);
         return result._href && isValid(result._href) ? result._href : null;
       }
-      return url;
+      return linkURL;
     };
 
     gBrowser.closeAllTabs = function TMP_closeAllTabs() {

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