Changeset 661

Timestamp:

02/15/08 12:36:11 (10 months ago)

Author:

ma..@jesperkristensen.dk

Message:

Make Config an XPCOM service.

Files:

• branches/config-service/src/chrome/chromeFiles/content/browser.js (modified) (8 diffs)
• branches/config-service/src/chrome/chromeFiles/content/browser.xul (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/content/config.js (modified) (23 diffs)
• branches/config-service/src/chrome/chromeFiles/content/install.xul (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/content/manage.css (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/content/manage.js (modified) (8 diffs)
• branches/config-service/src/chrome/chromeFiles/content/manage.xul (modified) (3 diffs)
• branches/config-service/src/chrome/chromeFiles/content/miscapis.js (modified) (2 diffs)
• branches/config-service/src/chrome/chromeFiles/content/newscript.js (modified) (3 diffs)
• branches/config-service/src/chrome/chromeFiles/content/newscript.xul (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/content/pages-overlay.js (modified) (6 diffs)
• branches/config-service/src/chrome/chromeFiles/content/pages-overlay.xul (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/content/scriptdownloader.js (modified) (8 diffs)
• branches/config-service/src/chrome/chromeFiles/content/utils.js (modified) (2 diffs)
• branches/config-service/src/chrome/chromeFiles/content/versioning.js (modified) (8 diffs)
• branches/config-service/src/components/greasemonkey.js (modified) (7 diffs)

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

@@ -28 +28 @@
-  this.menuCommanders = [];
-  this.currentMenuCommander = null;
-
-  (new Config()).updateVersion();
-
-  GM_listen(window, "load", GM_hitch(this, "chromeLoad"));
@@ -233 +231 @@
-  this.scriptDownloader_ = scriptDownloader;
-
-
-
-
-
-
+
-  var browser = this.tabBrowser.getBrowserForTab(tab);
-
@@ -265 +259 @@
-
-GM_BrowserUI.installScript = function(script){
-
-
-
+
-  this.showHorrayMessage(script.name);
-};
@@ -429 +421 @@
-
-function GM_showPopup(aEvent) {
-  var config = new Config();
-  config.load();
-  var popup = aEvent.target;
-  var url = getBrowser().contentWindow.document.location.href;
@@ -444 +434 @@
-  }
-
-  var foundInjectedScript = false;
-
-  // build the new list of scripts
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-        var mi = document.createElement('menuitem');
-        mi.setAttribute('label', script.name);
@@ -467 +444 @@
-
-        popup.insertBefore(mi, document.getElementById("gm-status-no-scripts-sep"));
-
-
-
-
-
-
-
+
+
+
-};
-
@@ -482 +455 @@
-function GM_popupClicked(aEvent) {
-  if (aEvent.button == 0 || aEvent.button == 2) {
-    var config = new Config();
-    config.load();
-    var scriptNum=aEvent.target.value;
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-    closeMenus(aEvent.target);
@@ -630 +598 @@
-
-GM_BrowserUI.manageMenuItemClicked = function() {
-
-
+
-};
-

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

@@ -16 +16 @@
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/dochandler.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/scriptdownloader.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/config.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/browser.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/accelimation.js" />

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

@@ -3 +3 @@
-
-function Config() {
-
-
-
-
+
+
+
+
+
+
+
+
-};
-
@@ -13 +17 @@
-  .loadSubScript("chrome://greasemonkey/content/versioning.js");
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      return i;
-    }
@@ -26 +58 @@
-};
-
-
+_
-  var domParser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
-                            .createInstance(Components.interfaces.nsIDOMParser);
-
-
+_
-  var doc = domParser.parseFromString(configContents, "text/xml");
-  var nodes = doc.evaluate("/UserScriptConfig/Script", doc, null, 0, null);
-
-
+_
-
-  for (var node = null; (node = nodes.iterateNext()); ) {
@@ -41 +73 @@
-    for (var i = 0, childNode = null; (childNode = node.childNodes[i]); i++) {
-      if (childNode.nodeName == "Include") {
-
+_
-      } else if (childNode.nodeName == "Exclude") {
-
+_
-      } else if (childNode.nodeName == "Require") {
-        var scriptRequire = new ScriptRequire(script);
-
-
+_
+_
-      } else if (childNode.nodeName == "Resource") {
-        var scriptResource = new ScriptResource(script);
-
-
-
-
-
+_
+_
+_
+_
+_
-      }
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    var scriptNode = doc.createElement("Script");
-
-
+_
-      var includeNode = doc.createElement("Include");
-
+_
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(includeNode);
-    }
-
-
+_
-      var excludeNode = doc.createElement("Exclude");
-
+_
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
-      scriptNode.appendChild(excludeNode);
-    }
-
-
-
+_
+_
-      var resourceNode = doc.createElement("Require");
-
-
+_
-
-      scriptNode.appendChild(doc.createTextNode("\n\t\t"));
@@ -99 +133 @@
-    }
-
-
-
+_
+_
-      var resourceNode = doc.createElement("Resource");
-
-
-
-
-
-
+_
+_
+_
+_
+_
-      }
-
@@ -116 +150 @@
-    scriptNode.appendChild(doc.createTextNode("\n\t"));
-
-
-
-
-
-
-
+_
+_
+_
+_
+_
+_
-
-    doc.firstChild.appendChild(doc.createTextNode("\n\t"));
@@ -129 +163 @@
-  doc.firstChild.appendChild(doc.createTextNode("\n"));
-
-
-
+
+
+
+
-  configStream.close();
-};
@@ -140 +176 @@
-
-  var script = new Script(this);
-
-
-
+
+
-
-  // read one line at a time looking for start meta delimiter or EOF
@@ -173 +208 @@
-          case "namespace":
-          case "description":
-
+"_" + 
-            break;
-          case "include":
+            script._includes.push(match[2]);
+            break;
-          case "exclude":
-[match[1]+"s"]
+._excludes
-            break;
-          case "require":
-            var reqUri = ioservice.newURI(match[2], null, uri);
-            var scriptRequire = new ScriptRequire(script);
-u
-
+_downloadU
+_
-            break;
-          case "resource":
@@ -205 +242 @@
-            var resUri = ioservice.newURI(res[2], null, uri);
-            var scriptResource = new ScriptResource(script);
-
-u
-
+_
+_downloadU
+_
-            break;
-        }
@@ -215 +252 @@
-
-  // if no meta info, default to reasonable values
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -234 +274 @@
-
-  try {
-find(script.namespace, script.name
+_find(script
-    if (existingIndex > -1)
-
-
-
-
-
-
-
-
-
-
-
-
-save(
+_
+
+_
+_
+
+_
+_
+
+_
+_
+
+_
+_changed(script, "install", null
-
-    GM_log("< Config.install");
@@ -260 +300 @@
-Config.prototype.uninstall = function(script, uninstallPrefs)
-{
-
-
-
-
-
+
+
+
+
+
+
-  else // if script is in the root, just remove the file
-
+_
-
-  if (uninstallPrefs) // Remove saved preferences
-namespace + "/" + script.
+_namespace + "/" + script._
-}
-
@@ -282 +323 @@
-Config.prototype.move = function(script, destination)
-{
-
+_
-  var to = -1;
-
@@ -292 +333 @@
-    to = from + destination;
-    to = Math.max(0, to);
-
+_
-  } else { // if destination is a script object
-
+_
-  }
-
@@ -300 +341 @@
-    return null;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-  if (newDir.exists())
-    return newDir;
-
-
+_
-  if (oldDir.exists())
-    return oldDir;
@@ -328 +368 @@
-});
-
-
+_
-  var file = Components.classes["@mozilla.org/file/directory_service;1"]
-                       .getService(Components.interfaces.nsIProperties)
@@ -336 +376 @@
-});
-
-
+_
-  var file = getContentDir();
-  file.append("scripts");
@@ -342 +382 @@
-});
-
+Config.prototype.__defineGetter__("scripts", function() {
+  return this._scripts.concat();
+});
+
+Config.prototype.getScriptsForUrl = function(url, onlyEnabled)
+{
+  var scripts = [];
+
+  scriptLoop:
+  for (var i = 0, script; script = this._scripts[i]; i++) {
+    if (script.enabled || !onlyEnabled) {
+      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;
+};
+
-function Script(config)
-{
-  this._config = config;
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-Script.prototype = {
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    return file;
-  },
-
-
-
-
-
+
+
+
+
+
+
-    return file;
-  },
+
+  get fileUrl() { return GM_getUriFromFile(this._file).spec; },
+  get textContent() { return getContents(this._file); },
-
-  _initFileName: function(name, useExt)
@@ -403 +498 @@
-  _initFile: function(tempFile)
-  {
-
-
+_
+_
-
-    file.append(name);
-    file.createUnique(Components.interfaces.nsIFile.DIRECTORY_TYPE, 0755);
-
+_
-
-    file.append(name + ".user.js");
-    file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
-
+_
-
-    GM_log("Moving script file from " + tempFile.path + " to " + file.path);
@@ -418 +513 @@
-    file.remove(true);
-    tempFile.moveTo(file.parent, file.leafName);
-
+
+
+
+
-}
-
@@ -424 +522 @@
-{
-  this._script = script;
-
-
-
+
+
+
+
-}
-
-ScriptRequire.prototype = {
-
-
-
-
+_
+
+_
+_
-    return file;
-  },
-
+  get fileUrl() { return GM_getUriFromFile(this._file).spec; },
+  get textContent() { return getContents(this._file); },
+
-  _initFile: function()
-  {
-u
+_downloadU
-    if(name.indexOf("?") > 0)
-      name = name.substr(0, name.indexOf("?"));
-    name = this._script._initFileName(name, true);
-
-
+_
-    file.append(name);
-    file.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, 0644);
-
-
-
+_
+
+_
-
-    file.remove(true);
-
-
-
+
+
+
+
+
+
-}
-
@@ -460 +565 @@
-{
-  this._script = script;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-
-ScriptResource.prototype = {
-
-
-
-
+
+
+
+
+
+
-    return file;
-  },
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

branches/config-service/src/chrome/chromeFiles/content/install.xul

@@ -26 +26 @@
-
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/utils.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/config.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/scriptdownloader.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/prefmanager.js" />

branches/config-service/src/chrome/chromeFiles/content/manage.css

@@ -4 +4 @@
-the original starting size of the elements before flexing.
-*/
-dialog
+window
-  width: 600px;
-
+
+
-}
-#col_left {

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

@@ -1 @@
-
-
+
-
-window.addEventListener("load", function(ev) {
-  config.load();
-  loadControls();
-
@@ -10 +8 @@
-    chooseScript(0);
-  }
+
+  config.addObserver(observer);
-}, false);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -39 +72 @@
-  btnUninstall.addEventListener("command", function() { handleUninstallButton(); }, false);
-  chkEnabled.addEventListener("command", function() {
- {
+
-       selectedScript.enabled = chkEnabled.checked;
-       if (selectedScript.enabled) {
-         listbox.selectedItem.style.color = '';
-       } else {
-         listbox.selectedItem.style.color = 'gray';
-       }
-     }
-  }, false);
-};
@@ -57 +84 @@
-    chkEnabled.checked = true;
-    pagesControl.clear();
-    document.documentElement.getButton("accept").disabled = false;
-  } else {
-    selectedScript = listbox.getSelectedItem(0).script;
@@ -86 +112 @@
-
-function handleUninstallButton() {
-
-
-
-
-
-
-
-
-
-
-
+
+
-};
-
-function populateChooser() {
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  listbox.appendChild(listitem);
-  }
-};
-
@@ -119 +140 @@
-  listbox.selectedIndex = index;
-  listbox.focus();
-};
-
-function toggleScript(index, enableFlag) {
-  var listitem = listbox.childNodes[index];
-  if (enableFlag) {
-    listitem.script.enabled = true;
-    listitem.style.color = '';
-  } else {
-    listitem.script.enabled = false;
-    listitem.style.color = 'gray';
-  }
-};
-
-function reorderScript(from, to) {
-  // REORDER DISPLAY:
-  var tmp = listbox.childNodes[from];
-  listbox.removeChild(tmp);
-  listbox.insertBefore(tmp, listbox.childNodes[to]);
-  // fix the listbox indexes
-  for (var i=0, node=null; node=listbox.childNodes[i]; i++) {
-    node.index=i;
-  }
-
-  // then re-select the dropped script
-  listbox.selectedIndex = to;
-};
-
@@ -158 +154 @@
-  else if (KeyEvent.DOM_VK_DOWN == event.keyCode)
-    move = config.move(listbox.selectedItem.script, 1);
-
-  if (move)
-    reorderScript(move.from, move.to);
-};
-
@@ -204 +197 @@
-    // do the move
-    var move = config.move(config.scripts[index], config.scripts[newIndex]);
-    if (move)
-      reorderScript(move.from, move.to);
-  },
-

branches/config-service/src/chrome/chromeFiles/content/manage.xul

@@ -6 +6 @@
-<!DOCTYPE dialog SYSTEM "chrome://greasemonkey/locale/greasemonkey.dtd">
-
-
+
+
-  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-  buttons="accept,cancel"
-  ondialogaccept="return handleOkButton()"
-  title="&manage.title;"
-  orient="vertical">
@@ -17 +16 @@
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/utils.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/prefmanager.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/config.js" />
-  <script type="application/x-javascript" src="chrome://greasemonkey/content/manage.js" />
-
@@ -70 +68 @@
-  </grid>
-
-dialog
+window

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

@@ -32 +32 @@
-  }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-