[IMP] jQuery deferred API changes refactoring. Changed 'then's in 'done'/'fail' and 'pipe's in 'then'

bzr revid: fme@openerp.com-20121030140630-gf20ye8fou1ebxft

3 files changed, 34 insertions, 34 deletions

diff --git a/addons/web/static/test/fulltest/dataset.js b/addons/web/static/test/fulltest/dataset.js
index f7e64fba53e..cc2d1b47d63 100644
--- a/addons/web/static/test/fulltest/dataset.js
+++ b/addons/web/static/test/fulltest/dataset.js
@@ -82,7 +82,7 @@ $(document).ready(function () {
     });
     t.test('call', function (openerp) {
         var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
-        t.expect(ds.call('frob', ['a', 'b', 42]).then(function (r) {
+        t.expect(ds.call('frob', ['a', 'b', 42]).done(function (r) {
             strictEqual(r.method, 'frob');
 
             strictEqual(r.args.length, 3);
@@ -91,7 +91,7 @@ $(document).ready(function () {
             ok(_.isEmpty(r.kwargs));
         }));
     });
-    t.test('name_get').then(function (openerp) {
+    t.test('name_get').done(function (openerp) {
         var ds = new openerp.web.DataSet({session: openerp.session}, 'mod');
         t.expect(ds.name_get([1, 2], null), function (r) {
             strictEqual(r.method, 'name_get');
diff --git a/addons/web/static/test/list-editable.js b/addons/web/static/test/list-editable.js
index 0388e56048d..459a6df397a 100644
--- a/addons/web/static/test/list-editable.js
+++ b/addons/web/static/test/list-editable.js
@@ -107,12 +107,12 @@ $(document).ready(function () {
         });
         var counter = 0;
         e.appendTo($fix)
-            .pipe(function () {
+            .then(function () {
                 return e.edit({}, function () {
                     ++counter;
                 });
             })
-            .pipe(function (form) {
+            .then(function (form) {
                 ok(e.is_editing(), "should be editing");
                 equal(counter, 3, "should have configured all fields");
                 return e.save();
@@ -137,12 +137,12 @@ $(document).ready(function () {
         });
         var counter = 0;
         e.appendTo($fix)
-            .pipe(function () {
+            .then(function () {
                 return e.edit({}, function () {
                     ++counter;
                 });
             })
-            .pipe(function (form) {
+            .then(function (form) {
                 return e.cancel();
             })
             .always(start)
@@ -170,12 +170,12 @@ $(document).ready(function () {
         var counter = 0;
         var warnings = 0;
         e.appendTo($fix)
-            .pipe(function () {
+            .then(function () {
                 return e.edit({}, function () {
                     ++counter;
                 });
             })
-            .pipe(function (form) {
+            .then(function (form) {
                 return e.save();
             })
             .always(start)
@@ -243,16 +243,16 @@ $(document).ready(function () {
         var l = new instance.web.ListView({}, ds, false, {editable: 'top'});
 
         l.appendTo($fix)
-            .pipe(l.proxy('reload_content'))
-            .pipe(function () {
+            .then(l.proxy('reload_content'))
+            .then(function () {
                 return l.start_edition();
             })
             .always(start)
-            .pipe(function () {
+            .then(function () {
                 ok(got_defaults, "should have fetched default values for form");
                 return l.save_edition();
             })
-            .pipe(function (result) {
+            .then(function (result) {
                 ok(result.created, "should yield newly created record");
                 equal(result.record.get('a'), "qux",
                       "should have used default values");
@@ -307,14 +307,14 @@ $(document).ready(function () {
         var l = new instance.web.ListView({}, ds, false, {editable: 'top'});
         l.on('edit:before edit:after', o, o.onEvent);
         l.appendTo($fix)
-            .pipe(l.proxy('reload_content'))
+            .then(l.proxy('reload_content'))
             .always(start)
-            .pipe(function () {
+            .then(function () {
                 ok(l.options.editable, "should be editable");
                 equal(o.counter, 0, "should have seen no event yet");
                 return l.start_edition(l.records.get(1));
             })
-            .pipe(function () {
+            .then(function () {
                 ok(l.editor.is_editing(), "should be editing");
                 equal(o.counter, 2, "should have seen two edition events");
             })
@@ -332,14 +332,14 @@ $(document).ready(function () {
             edit_after = true;
         });
         l.appendTo($fix)
-            .pipe(l.proxy('reload_content'))
+            .then(l.proxy('reload_content'))
             .always(start)
-            .pipe(function () {
+            .then(function () {
                 ok(l.options.editable, "should be editable");
                 return l.start_edition();
             })
             // cancelling an event rejects the deferred
-            .pipe($.Deferred().reject(), function () {
+            .then($.Deferred().reject(), function () {
                 ok(!l.editor.is_editing(), "should not be editing");
                 ok(!edit_after, "should not have fired the edit:after event");
                 return $.when();
diff --git a/addons/web/static/test/rpc.js b/addons/web/static/test/rpc.js
index fbe7147f2e6..eb9019287ce 100644
--- a/addons/web/static/test/rpc.js
+++ b/addons/web/static/test/rpc.js
@@ -29,10 +29,10 @@ $(document).ready(function () {
             fail1 = false, fail2 = false;
 
         var d1 = $.Deferred(), d2 = $.Deferred();
-        dm.add(d1).then(function () { done1 = true; },
-                        function () { fail1 = true; });
-        dm.add(d2).then(function () { done2 = true; },
-                        function () { fail2 = true; });
+        dm.add(d1).done(function () { done1 = true; }
+                  .fail(function () { fail1 = true; });
+        dm.add(d2).done(function () { done2 = true; })
+                  .fail(function () { fail2 = true; });
 
         d2.resolve();
         d1.resolve();
@@ -50,10 +50,10 @@ $(document).ready(function () {
             fail1 = false, fail2 = false;
 
         var d1 = $.Deferred(), d2 = $.Deferred();
-        dm.add(d1).then(function () { done1 = true; },
-                        function () { fail1 = true; });
-        dm.add(d2).then(function () { done2 = true; },
-                        function () { fail2 = true; });
+        dm.add(d1).done(function () { done1 = true; })
+                  .fail(function () { fail1 = true; });
+        dm.add(d2).done(function () { done2 = true; })
+                  .fail(function () { fail2 = true; });
 
         d2.resolve();
         d1.resolve();
@@ -86,10 +86,10 @@ $(document).ready(function () {
             fail1 = false, fail2 = false;
 
         var d1 = $.Deferred(), d2 = $.Deferred();
-        dm.add(d1).then(function () { done1 = true; },
-                        function () { fail1 = true; });
-        dm.add(d2).then(function () { done2 = true; },
-                        function () { fail2 = true; });
+        dm.add(d1).done(function () { done1 = true; })
+                  .fail(function () { fail1 = true; });
+        dm.add(d2).done(function () { done2 = true; })
+                  .fail(function () { fail2 = true; });
 
         setTimeout(function () { d1.resolve(); }, 200);
         setTimeout(function () { d2.resolve(); }, 100);
@@ -110,10 +110,10 @@ $(document).ready(function () {
             fail1 = false, fail2 = false;
 
         var d1 = $.Deferred(), d2 = $.Deferred();
-        dm.add(d1).then(function () { done1 = true; },
-                        function () { fail1 = true; });
-        dm.add(d2).then(function () { done2 = true; },
-                        function () { fail2 = true; });
+        dm.add(d1).done(function () { done1 = true; })
+                  .fail(function () { fail1 = true; });
+        dm.add(d2).done(function () { done2 = true; })
+                  .fail(function () { fail2 = true; });
 
         setTimeout(function () { d1.resolve(); }, 200);
         setTimeout(function () { d2.resolve(); }, 100);