Changeset 3386 for lang/javascript/jsdeferred

Timestamp:

12/21/07 07:21:32 (13 months ago)

Author:

cho45

Message:

lang/javascript/jsdeferred/trunk/jsdeferred.mini.js,
lang/javascript/jsdeferred/trunk/jsdeferred.jquery.js,
lang/javascript/jsdeferred/trunk/jsdeferred.js,
lang/javascript/jsdeferred/trunk/jsdeferred.nodoc.js,
lang/javascript/jsdeferred/trunk/jsdeferred.userscript.js:

cancel の伝播
最初の deferred の cancel() をよぶことで以降すべてのキャンセルも起動するように

Location:

lang/javascript/jsdeferred/trunk

Files:

• jsdeferred.jquery.js (modified) (2 diffs)
• jsdeferred.js (modified) (2 diffs)
• jsdeferred.mini.js (modified) (2 diffs)
• jsdeferred.nodoc.js (modified) (2 diffs)
• jsdeferred.userscript.js (modified) (2 diffs)

lang/javascript/jsdeferred/trunk/jsdeferred.jquery.js

@@ -13 +13 @@
 fail:function(err){return this._fire("ng",err)},
 cancel:function(){
-(this.canceller || function(){})();return this.init();},
+(this.canceller || function(){})();if(this._next)this._next.cancel();return this.init();},
 _post:function(okng,fun){
 this._next=new Deferred();this._next.callback[okng]=fun;return this._next;},
@@ -34 +34 @@
 }).error(function(e){
 ret.fail(e);});num++;})(dl[i],i);}
-if(!num)Deferred.next(function(){ret.call()});return ret;};Deferred.wait=function(n){
+if(!num)Deferred.next(function(){ret.call()});ret.canceller=function(){
+for(var i in dl){
+if(!dl.hasOwnProperty(i))continue;dl[i].cancel();}
+};return ret;};Deferred.wait=function(n){
 var d=new Deferred(),t=new Date();var id=setTimeout(function(){
 clearTimeout(id);d.call((new Date).getTime()-t.getTime());},n*1000)

lang/javascript/jsdeferred/trunk/jsdeferred.js

@@ -99 +99 @@
         cancel : function () {
                 (this.canceller || function () {})();
+                if (this._next) this._next.cancel();
                 return this.init();
         },
@@ -170 +171 @@
         }
         if (!num) Deferred.next(function () { ret.call() });
+        ret.canceller = function () {
+                for (var i in dl) {
+                        if (!dl.hasOwnProperty(i)) continue;
+                        dl[i].cancel();
+                }
+        };
         return ret;
 };

lang/javascript/jsdeferred/trunk/jsdeferred.mini.js

@@ -13 +13 @@
 fail:function(err){return this._fire("ng",err)},
 cancel:function(){
-(this.canceller || function(){})();return this.init();},
+(this.canceller || function(){})();if(this._next)this._next.cancel();return this.init();},
 _post:function(okng,fun){
 this._next=new Deferred();this._next.callback[okng]=fun;return this._next;},
@@ -34 +34 @@
 }).error(function(e){
 ret.fail(e);});num++;})(dl[i],i);}
-if(!num)Deferred.next(function(){ret.call()});return ret;};Deferred.wait=function(n){
+if(!num)Deferred.next(function(){ret.call()});ret.canceller=function(){
+for(var i in dl){
+if(!dl.hasOwnProperty(i))continue;dl[i].cancel();}
+};return ret;};Deferred.wait=function(n){
 var d=new Deferred(),t=new Date();var id=setTimeout(function(){
 clearTimeout(id);d.call((new Date).getTime()-t.getTime());},n*1000)

lang/javascript/jsdeferred/trunk/jsdeferred.nodoc.js

@@ -19 +19 @@
         cancel : function () {
                 (this.canceller || function () {})();
+                if (this._next) this._next.cancel();
                 return this.init();
         },
@@ -66 +67 @@
         }
         if (!num) Deferred.next(function () { ret.call() });
+        ret.canceller = function () {
+                for (var i in dl) {
+                        if (!dl.hasOwnProperty(i)) continue;
+                        dl[i].cancel();
+                }
+        };
         return ret;
 };

lang/javascript/jsdeferred/trunk/jsdeferred.userscript.js

@@ -23 +23 @@
         cancel : function () {
                 (this.canceller || function () {})();
+                if (this._next) this._next.cancel();
                 return this.init();
         },
@@ -70 +71 @@
         }
         if (!num) Deferred.next(function () { ret.call() });
+        ret.canceller = function () {
+                for (var i in dl) {
+                        if (!dl.hasOwnProperty(i)) continue;
+                        dl[i].cancel();
+                }
+        };
         return ret;
 };