Changeset 105

Timestamp:

08/09/07 16:10:22 (17 months ago)

Author:

chris

Message:

* Fixed javascript timer bug reported by Drarok
* Fixed error caused by trying to update finished items when there were none

Location:

trunk

Files:

• CHANGELOG (modified) (1 diff)
• js/hellaworld.js (modified) (4 diffs)

trunk/CHANGELOG

@@ +1 @@
+1.8
+
+* Fixed a couple of Javascript bugs, one would cause a drag and drop sort
+  to say an error had occured despite it having completed successfully if
+  there were no finished items and finished items were set to display.
+  The second javascript bug involved the 15 second refresh, instead of
+  re-creating the existing timer, it was creating a new one for each
+  refresh, meaning after a while it was refreshing every second or so.
+
 1.7
 

trunk/js/hellaworld.js

@@ -13 +13 @@
 
         function startRefresher() {
-                refresh = true;
-                setTimeout('refresher()', 15000);
+                if (refresh) {
+                        clearTimeout(refresh);
+                }
+                refresh = setTimeout('refresher()', 15000);
         }
 
         function stopRefresher() {
-                refresh = false;
+                if (refresh) {
+                        clearTimeout(refresh);
+                        refresh = false;
+                }
         }
 
@@ -35 +40 @@
                                                 updateData(json);
                                         },
-                                        error : function() {
+                                        error : function(foo, bar, wee) {
                                                 alert('Apologies, there was an error while making the request');
                                         }
@@ -93 +98 @@
                         makeSortable();
                 }
-                if (json.finished) {
+                if (json.finished && json.finished.length > 0) {
                         var finished = '';
                         for (i = 0; i < json.finished.length; i++) {
@@ -118 +123 @@
                 if (refresh) {
                         $.getJSON('index.php?refresher=1', function(json) { updateData(json); }); 
-                        setTimeout('refresher()', 15000);
+                        clearTimeout(refresh);
+                        refresh = setTimeout('refresher()', 15000);
                 }
         }