0.6.6

c58 · Mar 10, 2016 · b953eb7 · b953eb7
1 parent 914eb59
commit b953eb7
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 20 deletions.
diff --git a/build/marsdb.js b/build/marsdb.js
@@ -427,19 +427,22 @@ var _defaultIdGenerator = _ShortIdGenerator2.default;
 // the second execution cycle
 var _startedUp = false;
 var _startUpQueue = [];
-var _startUpTimeout = 0;
+var _startUpId = 0;
 
 // Internals
 function _resetStartup() {
-  clearTimeout(_startUpTimeout);
+  _startUpId += 1;
   _startUpQueue = [];
   _startedUp = false;
-  _startUpTimeout = setTimeout(function () {
-    _startedUp = true;
-    (0, _forEach2.default)(_startUpQueue, function (fn) {
-      return fn();
-    });
-    _startUpQueue = [];
+  var currStartId = _startUpId;
+  setTimeout(function () {
+    if (currStartId === _startUpId) {
+      _startedUp = true;
+      (0, _forEach2.default)(_startUpQueue, function (fn) {
+        return fn();
+      });
+      _startUpQueue = [];
+    }
   }, 0);
 }
 
@@ -1763,7 +1766,6 @@ var CursorObservable = function (_Cursor) {
       var insertedInResult = updatedInResult || newDoc && !oldDoc && this._matcher.documentMatches(newDoc).result;
 
       if (insertedInResult) {
-        this.emit('cursorChanged');
         return this.update();
       }
     }
@@ -1812,6 +1814,10 @@ var CursorObservable = function (_Cursor) {
 
       var firstRun = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0];
 
+      if (!firstRun) {
+        this.emit('cursorChanged');
+      }
+
       return this.exec().then(function (result) {
         _this3._updateLatestIds();
         return _this3._propagateUpdate(firstRun).then(function () {

diff --git a/build/marsdb.min.js b/build/marsdb.min.js
diff --git a/dist/Collection.js b/dist/Collection.js
@@ -72,19 +72,22 @@ var _defaultIdGenerator = _ShortIdGenerator2.default;
 // the second execution cycle
 var _startedUp = false;
 var _startUpQueue = [];
-var _startUpTimeout = 0;
+var _startUpId = 0;
 
 // Internals
 function _resetStartup() {
-  clearTimeout(_startUpTimeout);
+  _startUpId += 1;
   _startUpQueue = [];
   _startedUp = false;
-  _startUpTimeout = setTimeout(function () {
-    _startedUp = true;
-    (0, _forEach2.default)(_startUpQueue, function (fn) {
-      return fn();
-    });
-    _startUpQueue = [];
+  var currStartId = _startUpId;
+  setTimeout(function () {
+    if (currStartId === _startUpId) {
+      _startedUp = true;
+      (0, _forEach2.default)(_startUpQueue, function (fn) {
+        return fn();
+      });
+      _startUpQueue = [];
+    }
   }, 0);
 }
 

diff --git a/dist/CursorObservable.js b/dist/CursorObservable.js
@@ -258,7 +258,6 @@ var CursorObservable = function (_Cursor) {
       var insertedInResult = updatedInResult || newDoc && !oldDoc && this._matcher.documentMatches(newDoc).result;
 
       if (insertedInResult) {
-        this.emit('cursorChanged');
         return this.update();
       }
     }
@@ -307,6 +306,10 @@ var CursorObservable = function (_Cursor) {
 
       var firstRun = arguments.length <= 0 || arguments[0] === undefined ? false : arguments[0];
 
+      if (!firstRun) {
+        this.emit('cursorChanged');
+      }
+
       return this.exec().then(function (result) {
         _this3._updateLatestIds();
         return _this3._propagateUpdate(firstRun).then(function () {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "marsdb",
-  "version": "0.6.5",
+  "version": "0.6.6",
   "author": {
     "name": "Artem Artemev",
     "email": "art@studytime.me"