Changeset 309

Timestamp:

05/28/07 10:34:28 (18 months ago)

Author:

t-bone

Message:

Closes #41

• Disable the cache-selection interface while a synchronous API call is being made.

Location:

extension/resurrect/content

Files:

• netError.xhtml (modified) (2 diffs)
• resurrect-select-mirror.xul (modified) (1 diff)
• resurrect.js (modified) (3 diffs)

extension/resurrect/content/netError.xhtml

@@ -197 +197 @@
         <h1 id="errorTitleText" />
     </div>
-    
+
     <!-- LONG CONTENT (the section most likely to require scrolling) -->
     <div id="errorLongContent">
@@ -220 +220 @@
 
         <p>&resurrect.thispage;</p>
-        <select id='mirror' size='5'>
+        <select id='mirror' size='6'>
             <option value='coralcdn'>&resurrect.coralcdn;</option>
             <option value='google'>&resurrect.google;</option>

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

@@ -23 +23 @@
 
         <label value='&resurrect.fromMirror;' />
-        <listbox id='mirror' rows='5' 
+        <listbox id='mirror' rows='6'
             onclick='resurrect.clickedXul(event);'
         >

extension/resurrect/content/resurrect.js

@@ -100 +100 @@
 
     clickedHtml:function(event) {
-        resurrect.selectMirror(
+        return resurrect.clickHandler(
             event.target.ownerDocument,
             event.target.ownerDocument,
@@ -108 +108 @@
 
     clickedXul:function(event) {
-        resurrect.selectMirror(
+        return resurrect.clickHandler(
             event.target.ownerDocument,
             window.arguments[0],
@@ -115 +115 @@
     },
 
+    clickHandler:function(ownerDoc, contentDoc, rawUrl) {
+        // Check, set, disabled status.
+        var listbox=ownerDoc.getElementById('mirror');
+
+        if (-1==listbox.selectedIndex) return false;
+        if (resurrect.disabled) return false;
+
+        resurrect.disabled=true;
+        listbox.setAttribute('disabled', true);
+
+        var button=contentDoc.getElementById('mirrorSelect');
+        if (!button && ownerDoc.documentElement.getButton) {
+            button=ownerDoc.documentElement.getButton('accept');
+        }
+        button.setAttribute('disabled', true);
+
+        // Run the actual code.  After timeout for UI repaint.
+        setTimeout(resurrect.selectMirror, 1, ownerDoc, contentDoc, rawUrl);
+    },
+
     selectMirror:function(ownerDoc, contentDoc, rawUrl) {
         var listbox=ownerDoc.getElementById('mirror');
-        if (resurrect.disabled) return false;
-        resurrect.disabled=true;
 
         var gotoUrl=null;