1. Fix: fix issue run in node 7.x

yaniswang · Jan 9, 2017 · c8cf4a6 · c8cf4a6
1 parent 60a863c
commit c8cf4a6
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 40 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,14 +4,16 @@ language: node_js
 node_js:
     - "4.2"
     - "5.0"
-
+    - "6.0"
+    - "7.0"
+
 cache:
   directories:
     - node_modules
 
 matrix:
   fast_finish: true
-  
+
 script: "grunt"
 
-after_success: istanbul-coveralls
+after_success: istanbul-coveralls
diff --git a/CHANGE.md b/CHANGE.md
@@ -1,6 +1,10 @@
 PromiseClass change log
 ====================
 
+## ver 1.0.3 (2017-1-9)
+
+1. Fix: fix issue run in node 7.x
+
 ## ver 1.0.2 (2016-12-20)
 
 1. Fix: fix issue when catch error by promise

diff --git a/lib/promiseclass.js b/lib/promiseclass.js
@@ -54,48 +54,48 @@ const PromiseClass = {
                 let self = this;
                 let args = Array.prototype.slice.call(arguments, 0);
                 let isAsync = /(\(|,)\s*(done|callback|cb)\s*\)\s*\{/i.test(fn);
-                let deferred = ChainPromise.defer();
-                let promise = deferred.promise;
-                let callback;
-                if(isCallback(args[args.length - 1])){
-                    // async mode
-                    callback = args.pop();
-                }
-                function done(error, ret){
-                    if(callback){
-                        let newRet = callback.call(self, error, ret);
-                        if(isGenerator(newRet)){
-                            // support callback generator
-                            newRet = co(newRet);
+                var promise = new ChainPromise(function(resolve, reject){
+                    let callback;
+                    if(isCallback(args[args.length - 1])){
+                        // async mode
+                        callback = args.pop();
+                    }
+                    function done(error, ret){
+                        if(callback){
+                            let newRet = callback.call(self, error, ret);
+                            if(isGenerator(newRet)){
+                                // support callback generator
+                                newRet = co(newRet);
+                            }
+                            resolve(newRet);
+                        }
+                        else{
+                            error ? reject(error) : resolve(ret);
                         }
-                        deferred.resolve(newRet);
                     }
-                    else{
-                        error ? deferred.reject(error) : deferred.resolve(ret);
+                    // async modem hook done
+                    if(isAsync){
+                        args.push(done);
                     }
-                }
-                // async modem hook done
-                if(isAsync){
-                    args.push(done);
-                }
-                try{
-                    let ret = fn.apply(self, args);
-                    // sync mode
-                    if(isAsync === false){
-                        if(ret !== undefined && isGenerator(ret)){
-                            // support method generator
-                            co(ret).then(function(ret){
+                    try{
+                        let ret = fn.apply(self, args);
+                        // sync mode
+                        if(isAsync === false){
+                            if(ret !== undefined && isGenerator(ret)){
+                                // support method generator
+                                co(ret).then(function(ret){
+                                    done(null, ret);
+                                }).catch(done);
+                            }
+                            else{
                                 done(null, ret);
-                            }).catch(done);
-                        }
-                        else{
-                            done(null, ret);
+                            }
                         }
                     }
-                }
-                catch(error){
-                    done(error);
-                }
+                    catch(error){
+                        done(error);
+                    }
+                });
                 promise._context = self;
                 return promise;
             }

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "promiseclass",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "description": "Create Promise chain Class",
   "main": "./index",
   "dependencies": {