fixbug of promise

DreamerWang · Apr 19, 2017 · 1d94bde · 1d94bde
1 parent d4147ba
commit 1d94bde
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 24 deletions.
diff --git a/promise/index.html b/promise/index.html
@@ -10,10 +10,8 @@
 <script>
 
     function start () {
-        var p = new Promise();
         console.log('start');
-        p.resolve();
-        return p;
+        return new Promise().resolve();
     }
 
     function test1() {
@@ -26,7 +24,7 @@
         setTimeout( function(){
             console.log('sleep1');
             p.resolve();
-        }, 200);
+        }, 2000);
 
         return p;
     }
@@ -69,9 +67,9 @@
  start().then( test1, null )
         .then( sleep1(), null )
         .then( test2, null )
-        .then( sleep2(), null )
-        .then( test3, null )
-        .then( sleep3(), null );
+        // .then( sleep2(), null )
+        // .then( test3, null )
+        // .then( sleep3(), null );
 
 </script>
 </body>

diff --git a/promise/promise.js b/promise/promise.js
@@ -15,23 +15,11 @@
     }
 
     /*
-     *给一个promise添加成功和失败回调函数
+     * 给一个promise添加成功和失败回调函数
      * @param {Function}
      * @param {Function}
      * @return {Obejct} 返回一个Promise对象
      **/
-    // Promise.prototype = {
-    //     constructor: Promise,
-    //     then: function(resolve, reject){
-
-    //     },
-    //     resolve: function(){
-
-    //     },
-    //     reject: function(){
-
-    //     }
-    // }
     Promise.prototype.then = function(resolve, reject) {
 
         if (resolve instanceof global.Promise) return resolve;
@@ -79,6 +67,8 @@
             this._resolves[i].apply(null);
         }
 
+        return this;
+
     };
 
     /*
@@ -93,23 +83,25 @@
         for (; i < len; i++) {
             this._rejects[i].apply(null);
         }
+
+        return this;
     };
 
     global.Promise = Promise;
 
 
     /****************功能函数*********************/
     function proxy(fun, context) {
-        var source = context || this;
+        var _self = context || this;
 
-        return fun.bind ? fun.bind(source) : function() {
-            fun.apply(source, arguments);
+        return fun.bind ? fun.bind(_self) : function() {
+            fun.apply(_self, arguments);
         };
     }
 
     function type(obj) {
         var o = {};
-        return o.toString.call(obj).replace(/^\[ Object (\w+)\]$/, '$1').toLowerCase();
+        return Object.toString.call(obj).replace(/^\[ Object (\w+)\]$/, '$1').toLowerCase();
     }
 
     function isFunc(obj) {