summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/openerpframework.js
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-11-13 16:19:11 +0100
committerXavier Morel <xmo@openerp.com>2013-11-13 16:19:11 +0100
commita3e4cdef515469a5988fe97b03bc89c58e9655f5 (patch)
treeb7e252a83e73d04606ff01e3545ab03a27e92c6e /addons/web/static/src/js/openerpframework.js
parentf02bb89702ac06500a1019c25c99526cecf1fdc1 (diff)
[ADD] hacky abort() proxy for json requests
bzr revid: xmo@openerp.com-20131113151911-l4f7vlzkcht38nuc
Diffstat (limited to 'addons/web/static/src/js/openerpframework.js')
-rw-r--r--addons/web/static/src/js/openerpframework.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/web/static/src/js/openerpframework.js b/addons/web/static/src/js/openerpframework.js
index e986a2f4112..a2e4c06d67d 100644
--- a/addons/web/static/src/js/openerpframework.js
+++ b/addons/web/static/src/js/openerpframework.js
@@ -809,7 +809,8 @@ var genericJsonRpc = function(fct_name, params, fct) {
params: params,
id: Math.floor(Math.random() * 1000 * 1000 * 1000)
};
- return fct(data).pipe(function(result) {
+ var xhr = fct(data);
+ var result = xhr.pipe(function(result) {
if (result.error !== undefined) {
console.error("Server application error", result.error);
return $.Deferred().reject("server", result.error);
@@ -821,6 +822,9 @@ var genericJsonRpc = function(fct_name, params, fct) {
var def = $.Deferred();
return def.reject.apply(def, ["communication"].concat(_.toArray(arguments)));
});
+ // FIXME: jsonp?
+ result.abort = function () { xhr.abort && xhr.abort(); };
+ return result;
};
openerp.jsonRpc = function(url, fct_name, params, settings) {