Changeset 736

Timestamp:

04/18/08 03:46:28 (8 months ago)

Author:

ma..@jesperkristensen.dk

Message:

small fixes for pages-overlay

Files:

• branches/manage-ui2/src/chrome/chromeFiles/content/manage.js (modified) (5 diffs)
• branches/manage-ui2/src/chrome/chromeFiles/content/newscript.js (modified) (1 diff)
• branches/manage-ui2/src/chrome/chromeFiles/content/pages-overlay.js (modified) (4 diffs)
• branches/manage-ui2/src/chrome/chromeFiles/content/utils.js (modified) (1 diff)

branches/manage-ui2/src/chrome/chromeFiles/content/manage.js

@@ -13 +13 @@
-
-window.addEventListener("unload", function(ev) {
-  pagesControl.clear();
-  config.removeObserver(observer);
-}, false);
@@ -56 +55 @@
-var listbox, header, description, chkEnabled, btnEdit, btnUninstall;
-var selectedScript;
-var pagesControl;
-
-function loadControls() {
@@ -64 +62 @@
-  btnEdit = document.getElementById("btnEdit");
-  btnUninstall = document.getElementById("btnUninstall");
-  pagesControl = gPagesControl;
-  chkEnabled = document.getElementById("chkEnabled");
-
@@ -82 +79 @@
-    description.textContent = " ";
-    chkEnabled.checked = true;
-p
+gP
-  } else {
-    selectedScript = listbox.getSelectedItem(0).script;
@@ -102 +99 @@
-    description.textContent = desc;
-    chkEnabled.checked = selectedScript.enabled;
-p
+gP
-  }
-}

branches/manage-ui2/src/chrome/chromeFiles/content/newscript.js

@@ -11 +11 @@
-
-  // default the includes with the current page's url
-
-
-
-
-
-
-
-
-
+
-}, false);
-

branches/manage-ui2/src/chrome/chromeFiles/content/pages-overlay.js

@@ +1 @@
+window.addEventListener("load", function(ev) {
+  var gmManageBundle = document.getElementById("gm-manage-bundle");
+  var defaultSite = gmManageBundle.getString("promptForNewPage.defVal");
+  document.getElementById("locationBox").value = GM_getCurrentSite() || defaultSite;
+  gPagesControl.onLocationInput();
+}, false);
+
+window.addEventListener("unload", function(ev) {
+  gPagesControl.clear(); // Don't leak observers
+}, false);
+
-var gPagesControl = {
-  notifyEvent: function(script, event, data) {
@@ -4 +15 @@
-    case "edit-include-add":
-      this.includes.push(data);
-excludes.length + this.includes.length - 1
+getRowFromPage('include', this.includes.length - 1)
-      break;
-    case "edit-include-remove":
-      this.includes.splice(data, 1);
-excludes.length + data
+getRowFromPage('include', data)
-      break;
-    case "edit-exclude-add":
-      this.excludes.push(data);
-excludes.length - 1
+getRowFromPage('exclude', this.excludes.length - 1)
-      break;
-    case "edit-exclude-remove":
-      this.excludes.splice(data, 1);
-data
+this.getRowFromPage('exclude', data)
-      break;
-    }
@@ -29 +40 @@
-    this.script = script;
-    this.script.addObserver(this);
+
-    document.getElementById("pagesTree").view = this.treeView;
-
-    var gmManageBundle = document.getElementById("gm-manage-bundle");
-    var wmi = Components.classes["@mozilla.org/appshell/window-mediator;1"]
-                        .getService(Components.interfaces.nsIWindowMediator);
-    var win = wmi.getMostRecentWindow("navigator:browser");
-    var currentSite = GM_isGreasemonkeyable(win.content.location.href)
-                      ? win.content.location.protocol + "//" +
-                        win.content.location.hostname + "/*"
-                      : gmManageBundle.getString("promptForNewPage.defVal");
-    document.getElementById("locationBox").value = currentSite;
-
-    this.onLocationInput();
-    this.onTreeSelect();
-  },
@@ -99 +99 @@
-  },
-
+  getRowFromPage: function(type, index) {
+    switch (type) {
+    case 'include': return this.excludes.length + index;
+    case 'exclude': return index;
+    default: throw new Error('Unknown page type');
+    }
+  },
+
-  treeView: {
-    get rowCount() {

branches/manage-ui2/src/chrome/chromeFiles/content/utils.js

@@ -92 +92 @@
-  parentWindow.openDialog("chrome://greasemonkey/content/newscript.xul", "",
-    "chrome,dependent,centerscreen,resizable,dialog");
+}
+
+function GM_getCurrentSite() {
+  var win = Components.classes["@mozilla.org/appshell/window-mediator;1"]
+                      .getService(Components.interfaces.nsIWindowMediator)
+                      .getMostRecentWindow("navigator:browser");
+
+  if (win) {
+    var location = win.content.location;
+    if (GM_isGreasemonkeyable(location.href)) {
+      return location.protocol + "//" + location.hostname + "/*";
+    }
+  }
+  return null;
-}
-