Changeset 667

Timestamp:

02/18/08 09:46:14 (10 months ago)

Author:

ma..@jesperkristensen.dk

Message:

misc code style fixes

Files:

• branches/config-service/src/chrome/chromeFiles/content/config.js (modified) (30 diffs)
• branches/config-service/src/chrome/chromeFiles/content/versioning.js (modified) (9 diffs)

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

@@ -2 +2 @@
-// used anywhere within this file and versioning.js
-
-
-
+
-  this._scripts = null;
-  this._configFile = this._scriptDir;
@@ -15 +14 @@
-
-Config.prototype = {
-
-
+
-    var observers = script ? script._observers : this._observers;
-    observers.push(observer);
-  },
-
-
-
+
-    var observers = script ? script._observers : this._observers;
-    var index = observers.indexOf(observer);
@@ -29 +26 @@
-  },
-
-
-
+
-    var observers = this._observers.concat(script._observers);
-    for (var i = 0, observer; observer = observers[i]; i++)
@@ -36 +32 @@
-  },
-
-
-
+
-    this._save();
-    this._notifyObservers(script, event, data);
-  },
-
-
-
+
-    return this._find(script) > -1;
-  },
-
-
-
+
-    namespace = aScript._namespace.toLowerCase();
-    name = aScript._name.toLowerCase();
@@ -59 +52 @@
-  },
-
-
-
+
-    var domParser = Components.classes["@mozilla.org/xmlextras/domparser;1"]
-                              .createInstance(Components.interfaces.nsIDOMParser);
@@ -91 +83 @@
-          scriptResource._filename = childNode.getAttribute("filename");
-          scriptResource._mimetype = childNode.getAttribute("mimetype");
- 
+
-          script._resources.push(scriptResource);
-          break;
@@ -108 +100 @@
-  },
-
-
-
+
-    var doc = Components.classes["@mozilla.org/xmlextras/domparser;1"]
-      .createInstance(Components.interfaces.nsIDOMParser)
@@ -141 +132 @@
-      }
-
-
+ 
-        var imp = scriptObj._resources[j];
-        var resourceNode = doc.createElement("Resource");
@@ -148 +139 @@
-        resourceNode.setAttribute("filename", imp._filename);
-        resourceNode.setAttribute("mimetype", imp._mimetype);
- {
+
-          resourceNode.setAttribute("charset", imp._charset);
-        }
-
-        scriptNode.appendChild(doc.createTextNode("\n\t\t"));
@@ -178 +168 @@
-  },
-
-
-
+
-    var ioservice = Components.classes["@mozilla.org/network/io-service;1"]
-                              .getService(Components.interfaces.nsIIOService);
@@ -206 +195 @@
-
-      while ((result = lines[lnIdx++])) {
- {
+
-          break;
-        }
-
-        var match = result.match(/\/\/ \@(\S+)\s+([^\n]+)/);
@@ -260 +248 @@
-
-    // if no meta info, default to reasonable values
- {
+
-      script._name = parseScriptName(uri);
-
-
-
+
+
-      script._namespace = uri.host;
-    }
-
-    if (!script._description)
-      script._description = "";
-
- {
+
-      script._includes.push("*");
-    }
-
-    return script;
-  },
-
-
-
+
-    GM_log("> Config.install");
-
@@ -301 +285 @@
-  },
-
-
-
+
-    var idx = this._find(script);
-    this._scripts.splice(idx, 1);
@@ -327 +310 @@
-   *                    the script will be moved.
-   */
-
-
+
-    var from = this._scripts.indexOf(script);
-    var to = -1;
@@ -352 +334 @@
-  },
-
-
-
+
-    var newDir = this._newScriptDir;
-    if (newDir.exists())
@@ -375 +356 @@
-  },
-
-
-
+
-    var file = Components.classes["@mozilla.org/file/directory_service;1"]
-                         .getService(Components.interfaces.nsIProperties)
@@ -384 +364 @@
-  },
-
-
-
+
-    var file = getContentDir();
-    file.append("scripts");
@@ -391 +370 @@
-  },
-
-
-
+
-    return this._scripts.concat();
-  },
-
-
-
+
-    var scripts = [];
-
@@ -425 +402 @@
-  .loadSubScript("chrome://greasemonkey/content/versioning.js");
-
-
-
+
-  this._config = config;
-  this._observers = [];
@@ -464 +440 @@
-  get resources() { return this._resources.concat(); },
-
-
-
+
-    var file = this._basedirFile;
-    file.append(this._filename);
@@ -473 +448 @@
-  get editFile() { return this._file; },
-
-
-
+
-    var file = this._config._scriptDir;
-    file.append(this._basedir);
@@ -483 +457 @@
-  get textContent() { return getContents(this._file); },
-
-
-
+
-    var ext = "";
-    name = name.toLowerCase();
@@ -511 +484 @@
-  },
-
-
-
+
-    var file = this._config._scriptDir;
-    var name = this._initFileName(this._name, false);
@@ -534 +506 @@
-};
-
-
-
+
-  this._script = script;
-
@@ -544 +515 @@
-
-ScriptRequire.prototype = {
-
-
+
-    var file = this._script._basedirFile;
-    file.append(this._filename);
@@ -554 +524 @@
-  get textContent() { return getContents(this._file); },
-
-
-
+
-    var name = this._downloadUrl.substr(this._downloadUrl.lastIndexOf("/") + 1);
-    if(name.indexOf("?") > 0)
@@ -577 +546 @@
-};
-
-
-
+
-  this._script = script;
-
@@ -593 +561 @@
-  get name() { return this._name; },
-
-
-
+
-    var file = this._script._basedirFile;
-    file.append(this._filename);
@@ -602 +569 @@
-  get textContent() { return getContents(this._file); },
-
-
-
+
-    var appSvc = Components.classes["@mozilla.org/appshell/appShellService;1"]
-                           .getService(Components.interfaces.nsIAppShellService);
@@ -622 +588 @@
-
-  get urlToDownload() { return this._downloadUrl; },
-
-
+
-    this._tempFile = tempFile;
-    this._mimetype = mimetype;

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

@@ -6 +6 @@
- * any necessary upgrades.
- */
-
-
+
-  log("> GM_updateVersion");
-
@@ -13 +12 @@
-  var initialized = GM_prefRoot.getValue("version", "0.0");
-
- {
+
-    this._pointThreeMigrate();
-  }
-
- {
+
-    this._pointFourMigrate();
-  }
-
- {
+
-    this._pointEightBackup();
-  }
-
-  // update the currently initialized version so we don't do this work again.
@@ -40 +36 @@
- * paranoid and backup the folder the first time 0.8 runs.
- */
-
-
+
-  var scriptDir = this._newScriptDir;
-  var scriptDirBackup = scriptDir.clone();
-  scriptDirBackup.leafName += "_08bak";
- {
+
-    scriptDir.copyTo(scriptDirBackup.parent, scriptDirBackup.leafName);
-  }
-};
-
@@ -53 +47 @@
- * Copies the entire scripts directory to the new location, if it exists.
- */
-
-
+
-  log("> GM_pointFourMigrate");
-
@@ -66 +59 @@
- * Migrates the configuration directory from the old format to the new one
- */
-
-
+
-  log("> GM_pointThreeMigrate");
-
@@ -76 +68 @@
-
-  log("config file exists: " + configExists);
- {
+
-    return;
-  }
-
-  // back up the config directory
@@ -92 +83 @@
-
-    // update the format of the config.xml file and move each file
-    var script = null;
-    var scriptFile = null;
-    var doc = document.implementation.createDocument("", "", null);
-
@@ -104 +93 @@
-    var nodes = document.evaluate("/UserScriptConfig/Script", doc, null,
-        XPathResult.UNORDERED_NODE_SNAPSHOT_TYPE, null);
-    var node;
-
-; (node = nodes.snapshotItem(i)); i++) {
- {
+, node; node = nodes.snapshotItem(i); i++)
+
-        node.setAttribute("filename", node.getAttribute("id"));
-      }
-    }
-
-    // save the config file
@@ -124 +110 @@
-    log("config reloaded, moving files.");
-
-; (script = this._scripts[i])
+, script = null; script = this._scripts[i]
-      if (script._filename.match(/^\d+$/)) {
-        var scriptFile = this._oldScriptDir;