[Pkg-mozext-commits] [greasemonkey] 20/55: Style cleanup.

[David Prévot]

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

taffit pushed a commit to branch master
in repository greasemonkey.

commit f6d82246e6dd5820fd18d7dff20ce643c71886f2
Author: Anthony Lieuallen <arantius at gmail.com>
Date:   Wed Sep 23 14:36:10 2015 -0400

    Style cleanup.
---
 content/browser.js     | 84 ++++++++++++++++++++++----------------------------
 content/framescript.js | 12 +++-----
 content/newscript.js   | 11 +++----
 3 files changed, 45 insertions(+), 62 deletions(-)

diff --git a/content/browser.js b/content/browser.js
index d0a1c21..73c60ae 100644
--- a/content/browser.js
+++ b/content/browser.js
@@ -94,7 +94,7 @@ GM_BrowserUI.openInTab = function(aMessage) {
     if (prefRel) {
       tabBrowser.moveTabTo(newTab, scriptTab._tPos + 1);
     } else {
-      tabBrowser.moveTabTo(newTab, tabBrowser.tabs.length - 1);  
+      tabBrowser.moveTabTo(newTab, tabBrowser.tabs.length - 1);
     }
   }, 0);
 };
@@ -111,62 +111,36 @@ GM_BrowserUI.chromeUnload = function() {
  * to show our context items.
  */
 GM_BrowserUI.contextMenuShowing = function() {
-  GM_BrowserUI.getUserScriptLinkUnderPointer(1)
+  GM_BrowserUI.getUserScriptUrlUnderPointer(function(aUrl) {
+    var contextItem = document.getElementById("greasemonkey-view-userscript");
+    var contextSep = document.getElementById("greasemonkey-install-sep");
+    contextItem.hidden = contextSep.hidden = !aUrl;
+  });
 };
 
-
-GM_BrowserUI.getUserScriptLinkUnderPointer = function(what) {
+GM_BrowserUI.getUserScriptUrlUnderPointer = function(callback) {
   var culprit = gContextMenu.target || document.popupNode;
+  if (!culprit) {
+    callback(null);
+    return;
+  }
 
   var mm = gBrowser.selectedBrowser.messageManager;
-
-  var callback = null;
-  callback = function (aMessage) {
-    mm.removeMessageListener("greasemonkey:context-menu-end", callback);
+  var messageHandler;
+  messageHandler = function (aMessage) {
+    mm.removeMessageListener("greasemonkey:context-menu-end", messageHandler);
 
     var href = aMessage.data.href;
-
-    var result = null;
-    if (culprit && href &&
-        href.match(/\.user\.js(\?|$)/i)) {
-      var ioSvc = Components.classes["@mozilla.org/network/io-service;1"]
-          .getService(Components.interfaces.nsIIOService);
-      var uri = ioSvc.newURI(href, null, null);
-      result = uri;
-    }
-
-    switch (what) {
-      case 1:
-        var contextItem = document
-            .getElementById("greasemonkey-view-userscript");
-        var contextSep = document.getElementById("greasemonkey-install-sep");
-
-        contextItem.hidden = contextSep.hidden = !result;
-        break;
-      case 2:
-        if (result) {
-          var scope = {};
-          Components.utils.import(
-              "chrome://greasemonkey-modules/content/remoteScript.js", scope);
-          var rs = new scope.RemoteScript(result.spec);
-          rs.downloadScript(function (aSuccess) {
-            if (aSuccess) {
-              rs.showSource(gBrowser);
-            } else {
-              alert(rs.errorMessage);
-            }
-          });
-        }
-        break;
+    if (href && href.match(/\.user\.js(\?|$)/i)) {
+      callback(href);
+    } else {
+      callback(null);
     }
   };
+  mm.addMessageListener("greasemonkey:context-menu-end", messageHandler);
 
-  mm.addMessageListener("greasemonkey:context-menu-end", callback);
-
-  gBrowser.selectedBrowser.messageManager
-      .sendAsyncMessage("greasemonkey:context-menu-start", {}, {
-        "culprit": culprit
-      });
+  mm.sendAsyncMessage(
+      "greasemonkey:context-menu-start", {}, {"culprit": culprit});
 };
 
 GM_BrowserUI.refreshStatus = function() {
@@ -188,7 +162,21 @@ GM_BrowserUI.startInstallScript = function(aUri) {
 };
 
 GM_BrowserUI.viewContextItemClicked = function() {
-  GM_BrowserUI.getUserScriptLinkUnderPointer(2);
+  GM_BrowserUI.getUserScriptUrlUnderPointer(function(aUrl) {
+    if (!aUrl) return;
+
+    var scope = {};
+    Components.utils.import(
+        "chrome://greasemonkey-modules/content/remoteScript.js", scope);
+    var rs = new scope.RemoteScript(aUrl);
+    rs.downloadScript(function (aSuccess) {
+      if (aSuccess) {
+        rs.showSource(gBrowser);
+      } else {
+        alert(rs.errorMessage);
+      }
+    });
+  });
 };
 
 GM_BrowserUI.showToolbarButton = function() {
diff --git a/content/framescript.js b/content/framescript.js
index c2bad92..8828bbe 100644
--- a/content/framescript.js
+++ b/content/framescript.js
@@ -132,18 +132,14 @@ function contextMenuStart(aMessage) {
     culprit = culprit.parentNode;
   }
 
-  var href = culprit.href;
-
-  aMessage.target.sendAsyncMessage("greasemonkey:context-menu-end", {
-    "href": href
-  });
+  aMessage.target.sendAsyncMessage(
+      "greasemonkey:context-menu-end", {"href": culprit.href});
 }
 
 
 function newScriptLoadStart(aMessage) {
-  aMessage.target.sendAsyncMessage("greasemonkey:newscript-load-end", {
-    "href": content.location.href
-  });
+  aMessage.target.sendAsyncMessage(
+      "greasemonkey:newscript-load-end", {"href": content.location.href});
 }
 
 
diff --git a/content/newscript.js b/content/newscript.js
index 7f56d6e..6bfe0ec 100644
--- a/content/newscript.js
+++ b/content/newscript.js
@@ -23,15 +23,14 @@ window.addEventListener("load", function window_load() {
   // default the includes with the current page's url
   var content = window.opener.gBrowser;
   if (content) {
-    var callback = null;
-    callback = function (aMessage) {
-      window.opener.messageManager
-          .removeMessageListener("greasemonkey:newscript-load-end", callback);
+    var messageHandler = null;
+    messageHandler = function (aMessage) {
+      window.opener.messageManager.removeMessageListener(
+          "greasemonkey:newscript-load-end", messageHandler);
       document.getElementById("include").value = aMessage.data.href;
     };
-
     window.opener.messageManager
-        .addMessageListener("greasemonkey:newscript-load-end", callback);
+        .addMessageListener("greasemonkey:newscript-load-end", messageHandler);
 
     content.selectedBrowser.messageManager
         .sendAsyncMessage("greasemonkey:newscript-load-start", {});

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