Bug fix (corrected some issues related to last commit)

bicherele · May 19, 2011 · b7ce6bd · b7ce6bd
1 parent 377030e
commit b7ce6bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/public/javascripts/backbone/server.push.js b/public/javascripts/backbone/server.push.js
@@ -1,4 +1,3 @@
-var synced = false;
 var auto_sync = false;
 
 $(function() {
@@ -8,12 +7,8 @@ $(function() {
         var faye = new Faye.Client('http://localhost:9292/faye');
         auto_sync = true;
         faye.subscribe('/sync', function(data) {
-            if (synced) {
-                synced = false;
-            } else if (data === 'ping') {
-                save(function() {
-                    synced = true;
-
+            if (data === 'ping') {
+                db.save(function() {
                     var items = new App.Collections.Items();
                     items.fetch({
                         success: function() {

diff --git a/public/javascripts/backbone/sync.js b/public/javascripts/backbone/sync.js
@@ -110,7 +110,7 @@ db = {
             if (using_localstorage)
                 console.log("All data loaded from localStorage!");
             if (window.navigator.onLine && !dontSync) {
-                sync(callback); // Sync to server
+                db.sync(callback); // Sync to server
             } else {
                 callback();
             }
@@ -122,7 +122,7 @@ db = {
             if (using_localstorage)
                 console.log("All data saved to localStorage!");
             if (window.navigator.onLine && !dontSync) {
-                sync(callback, item); // Sync to server
+                db.sync(callback, item); // Sync to server
             } else {
                 persistence.flush(); // Flush the new changes
                 callback();