Changeset 660

Timestamp:

02/11/08 06:33:40 (10 months ago)

Author:

ma..@jesperkristensen.dk

Message:

Move script reordering from manage.js to 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) (4 diffs)

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

@@ -272 +272 @@
-}
-
+/**
+ * Moves an installed user script to a new position in the array of installed scripts.
+ *
+ * @param script The script to be moved.
+ * @param destination Can be either (a) a numeric offset for the script to be
+ *                    moved or (b) another installet script to which position
+ *                    the script will be moved.
+ */
+Config.prototype.move = function(script, destination)
+{
+  var from = this.scripts.indexOf(script);
+  var to = -1;
+
+  // Make sure the user script is installed
+  if (from == -1)
+    return null;
+
+  if (typeof destination == 'number') { // if destination is an offset
+    to = from + destination;
+    to = Math.max(0, to);
+    to = Math.min(this.scripts.length - 1, to);
+  } else { // if destination is a script object
+    to = this.scripts.indexOf(destination);
+  }
+
+  if (to == -1)
+    return null;
+
+  var tmp = this.scripts.splice(from, 1)[0];
+  this.scripts.splice(to, 0, tmp);
+
+  return {from: from, to: to};
+};
+
-Config.prototype.__defineGetter__("scriptDir", function() {
-  var newDir = this.newScriptDir;

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

@@ -133 +133 @@
-
-function reorderScript(from, to) {
-  // make sure to and from are in range
-  if (from < 0 || to < 0 ||
-    from > config.scripts.length || to > config.scripts.length
-  ) {
-    return false;
-  }
-
-  // REORDER CONFIG:
-  // save item-to-move
-  var tmp = config.scripts[from];
-  // remove it
-  config.scripts.splice(from, 1);
-  // put it back in the new spot
-  config.scripts.splice(to, 0, tmp);
-
-  // REORDER DISPLAY:
-  var tmp = listbox.childNodes[from];
@@ -159 +144 @@
-  // then re-select the dropped script
-  listbox.selectedIndex = to;
-
-  return true;
-};
-
@@ -170 +153 @@
-  var index = listbox.selectedIndex;
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-};
-
@@ -223 +203 @@
-
-    // do the move
-
+
+
+
-  },
-