try to let txnQueue empty before reload

derbyjs · Oct 9, 2012 · cf1762a · cf1762a
1 parent dab3c6d
commit cf1762a
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/lib/derby.browser.js b/lib/derby.browser.js
@@ -84,7 +84,19 @@ function init(modelBundle, appHash, debug, ns, ctx) {
   racer.on('ready', function(model) {
     model.socket.on('connect', function() {
       model.socket.emit('derbyClient', appHash, function(reload) {
-        if (reload) window.location.reload(true);
+        if (reload) {
+          var retries = 0
+            , reloadOnEmpty = function() {
+                // TODO: Don't hack the Racer internal API so much
+                if (model._txnQueue.length && retries++ < 20) {
+                  // Clear out private path transactions that could get stuck
+                  model._specModel();
+                  return setTimeout(reloadOnEmpty, 100);
+                }
+                window.location.reload(true);
+              }
+          reloadOnEmpty();
+        }
       });
     });
     if (debug) autoRefresh(view, model);