Merge pull request #1118 from remotestorage/bugfix/1117-fix_undefined_stopped_property

Don't fail when sync instance is not defined

Author: Sebastian Kippe

src/remotestorage.js

@@ -701,13 +701,13 @@ RemoteStorage.prototype = {
    * @private
    */
   syncCycle: function () {
-    if (this.sync.stopped) {
+    if (!this.sync || this.sync.stopped) {
       return;
     }
 
     this.on('sync-done', function () {
       log('[Sync] Sync done. Setting timer to', this.getCurrentSyncInterval());
-      if (!this.sync.stopped) {
+      if (this.sync && !this.sync.stopped) {
         if (this._syncTimer) {
           clearTimeout(this._syncTimer);
           this._syncTimer = undefined;

test/unit/remotestorage-suite.js

@@ -593,6 +593,43 @@ define(['require', 'tv4', './src/eventhandling'], function (require, tv4, eventH
         }
       },
 
+      {
+        desc: "#syncCycle does not register any event handlers when there is no sync instance",
+        run: function (env, test) {
+          env.rs.syncCycle();
+
+          test.assert(env.rs._handlers["sync-done"].length, 0);
+        }
+      },
+
+      {
+        desc: "sync-done handler does not reschedule a new sync when sync is stopped",
+        run: function (env, test) {
+          env.rs.sync = { sync: function() {} };
+          env.rs.syncCycle();
+
+          env.rs.sync.stopped = true;
+
+          env.rs._emit('sync-done');
+
+          test.assert(env.rs._syncTimer, undefined);
+        }
+      },
+
+      {
+        desc: "sync-done handler does not reschedule a new sync when there is no sync instance",
+        run: function (env, test) {
+          env.rs.sync = { sync: function() {} };
+          env.rs.syncCycle();
+
+          env.rs.sync = undefined;
+
+          env.rs._emit('sync-done');
+
+          test.assert(env.rs._syncTimer, undefined);
+        }
+      },
+
       {
         desc: "#stopSync clears any scheduled sync calls",
         run: function (env, test) {