Changeset 377

Timestamp:

04/29/08 20:59:23 (2 weeks ago)

Author:

t-bone

Message:

• Wire up button disabling in the new UI; user feedback during synchronous API calls.
  

Files:

• extension/resurrect/content/resurrect-select-mirror.xul (modified) (2 diffs)
• extension/resurrect/content/resurrect.js (modified) (6 diffs)

extension/resurrect/content/resurrect-select-mirror.xul

@@ -7 +7 @@
-<dialog id="resurrect-select-mirror"
-    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+    xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-    title="&resurrect.title;"
-    buttons="cancel"
@@ -24 +25 @@
-    <label value='&resurrect.fromMirror;' />
-    <vbox id='resurrect' onclick='resurrect.clickedXul(event);'>
-
+xul:
-        value='coralcdn' label=' &resurrect.coralcdn;'
-        image='chrome://resurrect/skin/cacheicons/coralcdn.png'
-    />
-
+xul:
-        value='google' label=' &resurrect.google;'
-        image='chrome://resurrect/skin/cacheicons/google.png'
-    />
-
+xul:
-        value='googletext' label=' &resurrect.google;&resurrect.textonly;'
-        image='chrome://resurrect/skin/cacheicons/google.png'
-    />
-
+xul:
-        value='yahoo' label=' &resurrect.yahoo;'
-        image='chrome://resurrect/skin/cacheicons/yahoo.png'
-    />
-
+xul:
-        value='archive' label=' &resurrect.archive;'
-        image='chrome://resurrect/skin/cacheicons/archive.png'
-    />
-
+xul:
-        value='msn' label=' &resurrect.msn;'
-        image='chrome://resurrect/skin/cacheicons/msn.png'
-    />
-
+xul:
-        value='gigablast' label=' &resurrect.gigablast;'
-        image='chrome://resurrect/skin/cacheicons/gigablast.png'

extension/resurrect/content/resurrect.js

@@ -2 +2 @@
-
-    originalDoc:null,
-    disabled:false,
-
-// // // // // // // // // // // // // // // // // // // // // // // // // // //
@@ -32 +31 @@
-
-    attachClickEvent:function(event) {
-        resurrect.disabled=false;
-
-        var contentDoc=event.target;
+        var contentWin=contentDoc.defaultView;
+
-        if (contentDoc.documentURI.match(/^about:neterror/)) {
-            contentDoc.getElementById('resurrect').addEventListener(
-                'click', resurrect.clickedHtml, false
-            );
+        }
+    },
+
+    disableButtons:function(doc) {
+        var bs=doc.getElementById('resurrect')
+            .getElementsByTagName('xul:button');
+        for (var i=0, b=null; b=bs[i]; i++) {
+            b.setAttribute('disabled', 'true');
-        }
-    },
@@ -86 +93 @@
-
-    clickedHtml:function(event) {
+        if ('true'==event.target.getAttribute('disabled')) {
+            return;
+        }
+
-        return resurrect.clickHandler(
-            event,
-            event.target.ownerDocument,
-            event.target.ownerDocument,
-            event.target.ownerDocument.location.href
-        );
@@ -97 +107 @@
-        return resurrect.clickHandler(
-            event,
-            event.target.ownerDocument,
-            window.arguments[0],
-            window.arguments[1]
@@ -103 +112 @@
-    },
-
-
-
-
+
+
-
-        // Run the actual code.  After timeout for UI repaint.
-        setTimeout(
-            resurrect.selectMirror, 1,
-
+
+
+
-        );
-    },
@@ -218 +228 @@
-                setTimeout(window.close, 0);
-            }
-        } else {
-            resurrect.disabled=false;
-        }
-    }