Changeset 656

Timestamp:

02/10/08 03:17:29 (10 months ago)

Author:

ma..@jesperkristensen.dk

Message:

Move uninstall into config.js

Files:

• branches/config-service/src/chrome/chromeFiles/content/config.js (modified) (1 diff)
• branches/config-service/src/chrome/chromeFiles/content/manage.js (modified) (1 diff)

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

@@ -258 +258 @@
-};
-
+Config.prototype.uninstall = function(script, uninstallPrefs)
+{
+  var idx = this.find(script.namespace, script.name);
+  this.scripts.splice(idx, 1);
+
+  if (script.basedir) // if script has its own dir, remove the dir + contents
+    script.basedirFile.remove(true);
+  else // if script is in the root, just remove the file
+    script.file.remove(false);
+
+  if (uninstallPrefs) // Remove saved preferences
+     GM_prefRoot.remove("scriptvals." + script.namespace + "/" + script.name + ".");
+}
+
-Config.prototype.installDependency = function(script, req){
-  GM_log("Installing dependency: " + req.url  + " from " + req.tempFile.path);

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

@@ -13 +13 @@
-
-function handleOkButton() {
+  var uninstallPrefs = document.getElementById('chkUninstallPrefs').checked;
+
-  for (var i = 0, script = null; (script = uninstallList[i]); i++) {
-
-
+
-  }
-  config.save();
-
-  var chkUninstallPrefs = document.getElementById('chkUninstallPrefs');
-  for (var i = 0, script = null; (script = uninstallList[i]); i++) {
-    file = script.basedirFile;
-    file.normalize();
-    if (!file.equals(config.scriptDir)) {
-      if (file.exists()) {
-        file.remove(true); // file==base directory recursive delete
-      }
-    } else {
-      file = script.file;
-      if (file.exists()) {
-        file.remove(false);
-      }
-    }
-    if (chkUninstallPrefs.checked) {
-       // Remove saved preferences
-       var scriptPrefRoot = ["scriptvals.",
-                  script.namespace,
-                  "/",
-                  script.name,
-                  "."].join("");
-       GM_prefRoot.remove(scriptPrefRoot);
-    }
-  }
-  return true;
-};