diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-03-04 15:16:10 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-03-04 15:16:10 +0100 |
| commit | bc2fd0515b2ee0dafe05d95a76eccb99b35a418c (patch) | |
| tree | 0cf1fdbaa92b178ce51db635242e611e7d62173e /addons/web/static/lib/py.js | |
| parent | 94c33caa784e3017285b55dc68c6726ed50b5f94 (diff) | |
| parent | 017f346dd36e421877b2a7dfb94b5f805c435238 (diff) | |
[MERGE] forward port of branch 8.0 up to 017f346
Diffstat (limited to 'addons/web/static/lib/py.js')
| -rw-r--r-- | addons/web/static/lib/py.js/lib/py.js | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/addons/web/static/lib/py.js/lib/py.js b/addons/web/static/lib/py.js/lib/py.js index 2c6c832f9fe..35bb0b5223e 100644 --- a/addons/web/static/lib/py.js/lib/py.js +++ b/addons/web/static/lib/py.js/lib/py.js @@ -547,11 +547,13 @@ var py = {}; }; py.PY_call = function (callable, args, kwargs) { if (!args) { - args = []; kwargs = {}; - } else if (typeof args === 'object' && !(args instanceof Array)) { + args = []; + } + if (typeof args === 'object' && !(args instanceof Array)) { kwargs = args; args = []; - } else if (!kwargs) { + } + if (!kwargs) { kwargs = {}; } if (callable.__is_type) { |