Show
Ignore:
Timestamp:
12/17/07 21:25:07 (13 months ago)
Author:
cho45
Message:

lang/javascript/jsdeferred/trunk/jsdeferred.mini.js,
lang/javascript/jsdeferred/trunk/test-jsdeferred.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:

parallel にわたすのが空の場合はすぐコールバックするように

Location:
lang/javascript/jsdeferred/trunk
Files:
6 modified

Legend:

Unmodified
Added
Removed
  • lang/javascript/jsdeferred/trunk/jsdeferred.jquery.js

    r3214 r3224  
    3333ret.call(values);} 
    3434}).error(function(e){ 
    35 ret.fail(e);});num++;})(dl[i],i) 
    36 } 
    37 return ret;};Deferred.wait=function(n){ 
     35ret.fail(e);});num++;})(dl[i],i);} 
     36if(!num)Deferred.next(function(){ret.call()});return ret;};Deferred.wait=function(n){ 
    3837var d=new Deferred(),t=new Date();var id=setTimeout(function(){ 
    3938clearTimeout(id);d.call((new Date).getTime()-t.getTime());},n*1000) 
  • lang/javascript/jsdeferred/trunk/jsdeferred.js

    r3213 r3224  
    167167                        }); 
    168168                        num++; 
    169                 })(dl[i], i) 
     169                })(dl[i], i); 
    170170        } 
     171        if (!num) Deferred.next(function () { ret.call() }); 
    171172        return ret; 
    172173}; 
  • lang/javascript/jsdeferred/trunk/jsdeferred.mini.js

    r3214 r3224  
    3333ret.call(values);} 
    3434}).error(function(e){ 
    35 ret.fail(e);});num++;})(dl[i],i) 
    36 } 
    37 return ret;};Deferred.wait=function(n){ 
     35ret.fail(e);});num++;})(dl[i],i);} 
     36if(!num)Deferred.next(function(){ret.call()});return ret;};Deferred.wait=function(n){ 
    3837var d=new Deferred(),t=new Date();var id=setTimeout(function(){ 
    3938clearTimeout(id);d.call((new Date).getTime()-t.getTime());},n*1000) 
  • lang/javascript/jsdeferred/trunk/jsdeferred.nodoc.js

    r3214 r3224  
    6363                        }); 
    6464                        num++; 
    65                 })(dl[i], i) 
     65                })(dl[i], i); 
    6666        } 
     67        if (!num) Deferred.next(function () { ret.call() }); 
    6768        return ret; 
    6869}; 
  • lang/javascript/jsdeferred/trunk/jsdeferred.userscript.js

    r3215 r3224  
    6767                        }); 
    6868                        num++; 
    69                 })(dl[i], i) 
     69                })(dl[i], i); 
    7070        } 
     71        if (!num) Deferred.next(function () { ret.call() }); 
    7172        return ret; 
    7273}; 
  • lang/javascript/jsdeferred/trunk/test-jsdeferred.js

    r2817 r3224  
    329329                        expect("loop begin:1, end:10, step:3", [1,2,3,4,5,6,7,8,9,10].join(), r.join()); 
    330330                        expect("loop begin:1, end:10, step:3 last?", [false,false,false,true].join(), l.join()); 
     331                }); 
     332        }). 
     333        next(function () { 
     334                return parallel([]). 
     335                next(function () { 
     336                        ok("parallel no values"); 
    331337                }); 
    332338        }).