Changeset 2287

Timestamp:

12/02/07 16:40:38 (5 years ago)

Author:

cho45

Message:

lang/javascript/jquery-deferred/test-jquery-deferred.js,
lang/javascript/jquery-deferred/jquery-deferred.js:

next で余計な Deferred をつくらなくてすむように修正
これによって call しまくってかえってくるとき重かったのがなおった

Location:

lang/javascript/jquery-deferred

Files:

• doc/index.html (modified) (1 prop)
• jquery-deferred.js (modified) (2 diffs)
• test-jquery-deferred.js (modified) (2 diffs)

lang/javascript/jquery-deferred/jquery-deferred.js

@@ -104 +104 @@
 
         _post : function (okng, fun) {
-                this.callback[okng] = fun;
-                this._next = new Deferred();
-                return this._next;
+                var ret =  new Deferred();
+                ret.callback[okng] = fun;
+                this._next = ret;
+                return ret;
         },
 
         _fire : function (okng, value) {
+                // if (typeof log == 'function') log("_fire called");
                 var self = this;
                 var next = "ok";
@@ -217 +219 @@
         var d = new Deferred();
         setTimeout(function () { d.call() }, 0);
-        return d.next(fun);
+        d.callback.ok = fun;
+        return d;
 }
 

lang/javascript/jquery-deferred/test-jquery-deferred.js

@@ -35 +35 @@
 function msg (m) {
         $("<tr class='msg'><td colspan='3'>"+m+"</td></tr>").appendTo(results);
+        window.scrollTo(0, document.body.scrollHeight);
 }
 
 function print (m) {
         $("<tr class='msg low'><td colspan='3'>"+m+"</td></tr>").appendTo(results);
+        window.scrollTo(0, document.body.scrollHeight);
 }
 window.print = print;
+window.log = print;
 
 function ok () {
@@ -83 +86 @@
 expect("$.getJSON deferred", true, $.getJSON(".") instanceof $.deferred);
 
-var r = [];
-var d = new $.deferred();
-d.next(function () { ok("Callback called"); r.push(1) });
-d.call();
-expect("Callback called", 1, r.pop());
 
 // Start Main Test