[MERGE] Latest trunk.

bzr revid: vta@openerp.com-20121108132049-7ape10oz1gvz4vi8

1 files changed, 0 insertions, 34 deletions

diff --git a/addons/web/static/lib/jquery.deferred-queue/jquery.deferred-queue.js b/addons/web/static/lib/jquery.deferred-queue/jquery.deferred-queue.js
deleted file mode 100644
index 7ef83342f77..00000000000
--- a/addons/web/static/lib/jquery.deferred-queue/jquery.deferred-queue.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function ($) {
-    "use strict";
-    $.extend($.Deferred, {
-        queue: function () {
-            var queueDeferred = $.Deferred();
-            var promises = 0;
-
-            function resolve() {
-                if (--promises > 0) {
-                    return;
-                }
-                setTimeout($.proxy(queueDeferred, 'resolve'), 0);
-            }
-
-            var promise = $.extend(queueDeferred.promise(), {
-                push: function () {
-                    if (this.isResolved() || this.isRejected()) {
-                        throw new Error("Can not add promises to a resolved "
-                                        + "or rejected promise queue");
-                    }
-
-                    promises += 1;
-                    $.when.apply(null, arguments).then(
-                        resolve, $.proxy(queueDeferred, 'reject'));
-                    return this;
-                }
-            });
-            if (arguments.length) {
-                promise.push.apply(promise, arguments);
-            }
-            return promise;
-        }
-    });
-})(jQuery)