diff options
| author | Frédéric van der Essen <fva@openerp.com> | 2013-07-12 14:51:58 +0200 |
|---|---|---|
| committer | Frédéric van der Essen <fva@openerp.com> | 2013-07-12 14:51:58 +0200 |
| commit | 050b6b0ec523c1952d645a7db94580a5eec3536a (patch) | |
| tree | 0737150b273d21fe149ee54f603704bc40853cd2 /addons/web/static/src | |
| parent | 17db55200b31494427d26803da93b59be90c239d (diff) | |
| parent | 16d3b79dfd293a0430efb7cd97dd62944853c86b (diff) | |
[MERGE] adding timeout option to rpc calls
bzr revid: fva@openerp.com-20130712125158-63p24xm18zffpg86
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/corelib.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web/static/src/js/corelib.js b/addons/web/static/src/js/corelib.js index 3b328fb8765..58c2969bb20 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -1012,6 +1012,9 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, { if (! options.shadow) this.trigger('request', url, payload); + if (options.timeout) + url.timeout = options.timeout; + this.rpc_function(url, payload).then( function (response, textStatus, jqXHR) { if (! options.shadow) |