diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-07-11 10:44:51 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-07-11 10:44:51 +0200 |
| commit | ccc2dd61ced6a76334458be6056bc94075964cbe (patch) | |
| tree | 8186d239f6cfa813142e56d66292ba843037a765 /addons/web/static/src/js/corelib.js | |
| parent | 57d18c1a346464500d8176c3ef3473e31f5fd118 (diff) | |
| parent | 703039f7c6cd660210e2d1cf4b59c19323557956 (diff) | |
[MERGE] Merged lp:~openerp-dev/openerp-web/7.0-pos-improvements-fva (using -r 3867..3868).
[IMP] web corelib: adding timeout option to the rpc api
bzr revid: tde@openerp.com-20130711084451-inllzawy31589568
Diffstat (limited to 'addons/web/static/src/js/corelib.js')
| -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 116ddf2e8c2..1575065a9dd 100644 --- a/addons/web/static/src/js/corelib.js +++ b/addons/web/static/src/js/corelib.js @@ -1011,6 +1011,9 @@ instance.web.JsonRPC = instance.web.Class.extend(instance.web.PropertiesMixin, { var deferred = $.Deferred(); 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) { |