diff options
| author | Géry Debongnie <ged@odoo.com> | 2016-06-16 11:52:09 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-06-17 13:24:54 +0200 |
| commit | cfe13f79e6ab513f9753ee995cf9bd56dab4d3a4 (patch) | |
| tree | 9d6087b96bac2646eced57b9d9ac265d276d8965 /addons/web/static/src/js | |
| parent | 57c0398749c235c89de58485eb614cf06e308563 (diff) | |
[REF] web, web_calendar: move toBoolElse to web.utils
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/framework/core.js | 11 | ||||
| -rw-r--r-- | addons/web/static/src/js/framework/utils.js | 10 |
2 files changed, 10 insertions, 11 deletions
diff --git a/addons/web/static/src/js/framework/core.js b/addons/web/static/src/js/framework/core.js index 4d6d91d907b..9e2dfd964d0 100644 --- a/addons/web/static/src/js/framework/core.js +++ b/addons/web/static/src/js/framework/core.js @@ -37,17 +37,6 @@ _.each('resize,scroll'.split(','), function(evtype) { }); }); - -// Underscore customization -//------------------------------------------------------------------------- -_.str.toBoolElse = function (str, elseValues, trueValues, falseValues) { - var ret = _.str.toBool(str, trueValues, falseValues); - if (_.isUndefined(ret)) { - return elseValues; - } - return ret; -}; - // IE patch //------------------------------------------------------------------------- if (typeof(console) === "undefined") { diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js index 40774e9095d..edf7355dc29 100644 --- a/addons/web/static/src/js/framework/utils.js +++ b/addons/web/static/src/js/framework/utils.js @@ -462,6 +462,15 @@ function swap(array, elem1, elem2) { array[i1] = elem2; } +function toBoolElse (str, elseValues, trueValues, falseValues) { + var ret = _.str.toBool(str, trueValues, falseValues); + if (_.isUndefined(ret)) { + return elseValues; + } + return ret; +} + + return { divmod: divmod, modf: modf, @@ -491,6 +500,7 @@ return { reject_after: reject_after, delay: delay, swap: swap, + toBoolElse: toBoolElse, }; }); |
