Changeset 674

Timestamp:

03/10/08 11:33:13 (9 months ago)

Author:

oyasu..@gmail.com

Message:

Show user scripts that run for the top frame at the bottom of the monkey menu, and other scripts which run in sub-frames only (formerly not seen at all) on top, separated with a horizontal rule.

Files:

• trunk/src/chrome/chromeFiles/content/browser.js (modified) (2 diffs)
• trunk/src/chrome/chromeFiles/content/utils.js (modified) (1 diff)

trunk/src/chrome/chromeFiles/content/browser.js

@@ -429 +429 @@
-
-function GM_showPopup(aEvent) {
+  function urlsOfAllFrames(contentWindow) {
+    function collect(contentWindow) {
+      urls = urls.concat(urlsOfAllFrames(contentWindow));
+    }
+    var urls = [contentWindow.location.href];
+    Array.prototype.slice.call(contentWindow.frames).forEach(collect);
+    return urls;
+  }
+
+  function uniq(a) {
+    var seen = {}, list = [], item;
+    for (var i = 0; i < a.length; i++) {
+      item = a[i];
+      if (!seen.hasOwnProperty(item))
+        seen[item] = list.push(item);
+    }
+    return list;
+  }
+
+  function scriptsMatching(urls) {
+    var matching = [];
+    for (var i = 0, script = null; script = config.scripts[i]; i++)
+      for (var j = 0; j < urls.length; j++)
+        if (GM_scriptMatchesUrl(script, urls[j])) {
+          matching.push(script);
+          break;
+        }
+    return matching;
+  }
+
+  function appendScriptToPopup(script) {
+    var mi = document.createElement("menuitem");
+    mi.setAttribute("label", script.name);
+    mi.setAttribute("value", i);
+    mi.setAttribute("type", "checkbox");
+    mi.setAttribute("checked", script.enabled.toString());
+    popup.insertBefore(mi, tail);
+  }
+
-  var config = new Config();
-  config.load();
-  var popup = aEvent.target;
-url = getBrowser().contentWindow.document.location.href
+tail = document.getElementById("gm-status-no-scripts-sep")
-
-  // set the enabled/disabled state
@@ -444 +483 @@
-  }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  // build the new list of scripts
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-  document.getElementById("gm-status-no-scripts").collapsed = foundInjectedScript;
-};

trunk/src/chrome/chromeFiles/content/utils.js

@@ -497 +497 @@
-  }
-};
+
+function GM_scriptMatchesUrl(script, url) {
+ for (var i = 0, glob; glob = script.includes[i]; i++) {
+   var re = convert2RegExp(glob);
+   if (re.test(url)) {
+     for (var j = 0; glob = script.excludes[j]; j++) {
+       re = convert2RegExp(glob);
+       if (re.test(url))
+         return false;
+     }
+     return true;
+   }
+ }
+ return false;
+}