[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
This commit is contained in:
commit
ccc2dd61ce
|
@ -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)
|
||||
|
|
Loading…
Reference in New Issue