Changeset 678

Timestamp:

03/14/08 04:56:26 (9 months ago)

Author:

ma..@jesperkristensen.dk

Message:

merge in trunk r652:677

Files:

• branches/config-service/src/chrome/chromeFiles/content/browser.js (modified) (2 diffs)
• branches/config-service/src/chrome/chromeFiles/content/config.js (modified) (2 diffs)
• branches/config-service/src/chrome/chromeFiles/locale/en-US/greasemonkey.dtd (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/locale/fa-IR/greasemonkey.dtd (modified) (1 diff)
• branches/config-service/src/components/greasemonkey.js (modified) (1 diff)
• branches/config-service/src/foo/foo.user.js (modified) (1 diff)

branches/config-service/src/chrome/chromeFiles/content/browser.js

@@ -421 +421 @@
-
-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 allScripts = GM_getConfig().scripts;
+    var scripts = [];
+
+    for (var i = 0, script; script = allScripts[i]; i++) {
+      for (var j = 0; j < urls.length; j++) {
+        if (script.matchUrl(urls[j])) {
+          scripts.push(script);
+          break;
+        }
+      }
+    }
+
+    return scripts;
+  }
+
+  function appendScriptToPopup(script) {
+    var mi = document.createElement("menuitem");
+    mi.setAttribute("label", script.name);
+    mi.script = script;
+    mi.setAttribute("type", "checkbox");
+    mi.setAttribute("checked", script.enabled.toString());
+    popup.insertBefore(mi, tail);
+  }
+
-  var popup = aEvent.target;
-
+
+
-
-  // set the enabled/disabled state
@@ -434 +479 @@
-  }
-
+  var urls = uniq( urlsOfAllFrames( getBrowser().contentWindow ));
+  var runsOnTop = scriptsMatching( [urls.shift()] ); // first url = top window
+  var runsFramed = scriptsMatching( urls ); // remainder are all its subframes
+
+  // drop all runsFramed scripts already present in runsOnTop
+  for (var i = 0; i < runsOnTop.length; i++) {
+    var j = 0, item = runsOnTop[i];
+    while (j < runsFramed.length) {
+      if (item === runsFramed[j]) {
+        runsFramed.splice(j, 1);
+      } else {
+        j++;
+      }
+    }
+  }
+
-  // build the new list of scripts
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-};
-

branches/config-service/src/chrome/chromeFiles/content/config.js

@@ -374 +374 @@
-  get scripts() {
-    return this._scripts.concat();
-  },
-
-  getScriptsForUrl: function(url, includeDisabled) {
-    var scripts = [];
-
-    scriptLoop:
-    for (var i = 0, script; script = this._scripts[i]; i++) {
-      if (script.enabled || includeDisabled) {
-        for (var j = 0, include; include = script._includes[j]; j++) {
-          if (convert2RegExp(include).test(url)) {
-            for (var k = 0, exclude; exclude = script._excludes[k]; k++) {
-              if (convert2RegExp(exclude).test(url)) {
-                continue scriptLoop;
-              }
-            }
-            scripts.push(script);
-            continue scriptLoop;
-          }
-        }
-      }
-    }
-
-    return scripts;
-  }
-};
@@ -424 +401 @@
-
-Script.prototype = {
+  matchUrl: function(url) {
+    var scripts = [];
+
+    for (var j = 0, include; include = this._includes[j]; j++) {
+      if (convert2RegExp(include).test(url)) {
+        for (var k = 0, exclude; exclude = this._excludes[k]; k++) {
+          if (convert2RegExp(exclude).test(url)) {
+            return false;
+          }
+        }
+        return true;
+      }
+    }
+
+    return false;
+  },
+
-  _changed: function(event, data) { this._config._changed(this, event, data); },
-

branches/config-service/src/chrome/chromeFiles/locale/en-US/greasemonkey.dtd

@@ -22 +22 @@
-<!ENTITY menu.manage.accesskey "M">
-
-scripts installed!
+installed scripts match this page
-<!ENTITY statusbar.enabled "Enabled">
-<!ENTITY statusbar.enabled.accesskey "E">

branches/config-service/src/chrome/chromeFiles/locale/fa-IR/greasemonkey.dtd

@@ -20 +20 @@
-<!ENTITY menu.manage "Manage User Scripts...">
-<!ENTITY menu.manage.accesskey "M">
-scripts installed!
+installed scripts match this page
-<!ENTITY statusbar.enabled "Enabled">
-<!ENTITY statusbar.enabled.accesskey "E">

branches/config-service/src/components/greasemonkey.js

@@ -231 +231 @@
-
-  initScripts: function(url) {
-
+
+
+
+
+
+
+
+
+
-    log("* number of matching scripts: " + scripts.length);
-    return scripts;

branches/config-service/src/foo/foo.user.js

@@ -1 +1 @@
-// ==UserScript==
-// @name          Foo
-localhost
+http://www.greasespot.net/
-// @description   Foo'in around
-// @include       http://wiki.greasespot.net/*