[Jifty-commit] r7397 - jifty/trunk/share/web/static/js

[Jifty commits]

Author: sartak
Date: Thu Aug 13 22:26:01 2009
New Revision: 7397

Modified:
   jifty/trunk/share/web/static/js/jifty.js

Log:
Reorder ajax/set-preloading to avoid a feedback loop

Modified: jifty/trunk/share/web/static/js/jifty.js
==============================================================================
--- jifty/trunk/share/web/static/js/jifty.js	(original)
+++ jifty/trunk/share/web/static/js/jifty.js	Thu Aug 13 22:26:01 2009
@@ -1562,7 +1562,6 @@
     if (Jifty.preloading_regions[ args['preload_key'] ]) {
         return;
     }
-    Jifty.preloading_regions[ args['preload_key'] ] = 1;
 
     // Preloading is supposed to be silent
     args.hide_wait_message = 1;
@@ -1575,6 +1574,9 @@
     args.actions = [];
 
     Jifty.update(args, trigger);
+
+    // Now we're waiting on the AJAX request
+    Jifty.preloading_regions[ args['preload_key'] ] = 1;
 }
 
 function update ( named_args, trigger ) {