Fixed: sadd fault caused by Promise

iwillwen · Oct 18, 2015 · ff98cb2 · ff98cb2
1 parent c2796a4
commit ff98cb2
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 20 deletions.
diff --git a/dist/min-debug.js b/dist/min-debug.js
@@ -1,5 +1,5 @@
 /*!
- * MinDB (version 0.1.8) - Database on JavaScript
+ * MinDB (version 0.1.9) - Database on JavaScript
  * 
  * Will Wen Gunn(iwillwen) and other contributors
  * 
@@ -757,15 +757,11 @@ return /******/ (function(modules) { // webpackBootstrap
 	    });
 	  },
 	  // Object Extend
-	  extend: function extend() {
-	    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
-	      args[_key] = arguments[_key];
+	  extend: function extend(target) {
+	    for (var _len = arguments.length, objs = Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+	      objs[_key - 1] = arguments[_key];
 	    }
 
-	    var target = args[0];
-
-	    var objs = [].slice.call(args, 1);
-
 	    for (var i = 0, l = objs.length; i < l; i++) {
 	      var keys = Object.getOwnPropertyNames(objs[i] || {});
 
@@ -1396,7 +1392,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	        _this._keys[key] = 0;
 
 	        // Done
-	        promise.resolve([key, value]);
+	        promise.resolve(key);
 	        callback(null, key, value);
 	      });
 	    };
@@ -1412,7 +1408,7 @@ return /******/ (function(modules) { // webpackBootstrap
 	    this._keys[key] = 0;
 
 	    // Done
-	    promise.resolve([key, value]);
+	    promise.resolve(key);
 	    callback(null, key, value);
 	  }
 

diff --git a/dist/min.js b/dist/min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "min",
   "family": "iwillwen",
-  "version": "0.1.8",
+  "version": "0.1.10",
   "description": "Database on JavaScript",
   "main": "dist/min.js",
   "directories": {

diff --git a/src/mix.js b/src/mix.js
@@ -57,7 +57,7 @@ min.set = function(key, value, callback) {
         this._keys[key] = 0
 
         // Done
-        promise.resolve([key, value])
+        promise.resolve(key)
         callback(null, key, value)
       })
     }
@@ -73,7 +73,7 @@ min.set = function(key, value, callback) {
     this._keys[key] = 0
 
     // Done
-    promise.resolve([key, value])
+    promise.resolve(key)
     callback(null, key, value)
   }
 

diff --git a/src/utils.js b/src/utils.js
@@ -16,11 +16,7 @@ export default {
     })
   },
   // Object Extend
-  extend(...args) {
-    var target = args[0]
-
-    var objs = [].slice.call(args, 1)
-
+  extend(target, ...objs) {
     for (var i = 0, l = objs.length; i < l; i++) {
       var keys = Object.getOwnPropertyNames(objs[i] || {})