Merge branch 'master' of https://github.com/c58/marsdb

.editorconfig

@@ -0,0 +1,12 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false

lib/Collection.js

@@ -23,17 +23,20 @@ let _defaultIdGenerator = ShortIdGenerator;
 // the second execution cycle
 let _startedUp = false;
 let _startUpQueue = [];
-let _startUpTimeout = 0;
+let _startUpId = 0;
 
 // Internals
 export function _resetStartup() {
-  clearTimeout(_startUpTimeout);
+  _startUpId += 1;
   _startUpQueue = [];
   _startedUp = false;
-  _startUpTimeout = setTimeout(() => {
-    _startedUp = true;
-    _each(_startUpQueue, fn => fn());
-    _startUpQueue = [];
+  const currStartId = _startUpId;
+  setTimeout(() => {
+    if (currStartId === _startUpId) {
+      _startedUp = true;
+      _each(_startUpQueue, fn => fn());
+      _startUpQueue = [];
+    }
   }, 0);
 }