From cfe4b337af7c5ccef586289d1bd7d69a700d5d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Thu, 16 Jun 2016 14:00:22 +0200 Subject: [REF] web: move async_when to utils --- addons/web/static/src/js/framework/core.js | 26 -------------------------- addons/web/static/src/js/framework/data.js | 2 +- addons/web/static/src/js/framework/utils.js | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'addons/web/static/src/js/framework') diff --git a/addons/web/static/src/js/framework/core.js b/addons/web/static/src/js/framework/core.js index 9e2dfd964d0..8f0453151e8 100644 --- a/addons/web/static/src/js/framework/core.js +++ b/addons/web/static/src/js/framework/core.js @@ -129,32 +129,6 @@ qweb.preprocess_node = function() { _t('%d years ago'); } -$.async_when = function() { - var async = false; - var def = $.Deferred(); - $.when.apply($, arguments).done(function() { - var args = arguments; - var action = function() { - def.resolve.apply(def, args); - }; - if (async) - action(); - else - setTimeout(action, 0); - }).fail(function() { - var args = arguments; - var action = function() { - def.reject.apply(def, args); - }; - if (async) - action(); - else - setTimeout(action, 0); - }); - async = true; - return def; -}; - return { debug: debug, qweb: qweb, diff --git a/addons/web/static/src/js/framework/data.js b/addons/web/static/src/js/framework/data.js index e969616e7b6..98c9aacc82a 100644 --- a/addons/web/static/src/js/framework/data.js +++ b/addons/web/static/src/js/framework/data.js @@ -816,7 +816,7 @@ var BufferedDataSet = DataSetStatic.extend({ }); this.set_ids(_.difference(this.ids, _.pluck(_.filter(this.cache, function (c) {return c.to_delete;}), 'id'))); this.trigger("dataset_changed", ids, callback, error_callback); - return $.async_when({result: true}).done(callback); + return utils.async_when({result: true}).done(callback); }, reset_ids: function(ids, options) { var self = this; diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js index edf7355dc29..e19246823c5 100644 --- a/addons/web/static/src/js/framework/utils.js +++ b/addons/web/static/src/js/framework/utils.js @@ -470,6 +470,31 @@ function toBoolElse (str, elseValues, trueValues, falseValues) { return ret; } +function async_when() { + var async = false; + var def = $.Deferred(); + $.when.apply($, arguments).done(function() { + var args = arguments; + var action = function() { + def.resolve.apply(def, args); + }; + if (async) + action(); + else + setTimeout(action, 0); + }).fail(function() { + var args = arguments; + var action = function() { + def.reject.apply(def, args); + }; + if (async) + action(); + else + setTimeout(action, 0); + }); + async = true; + return def; +} return { divmod: divmod, @@ -501,6 +526,7 @@ return { delay: delay, swap: swap, toBoolElse: toBoolElse, + async_when: async_when, }; }); -- cgit v1.2.3