diff options
| author | Aaron Bohy <aab@odoo.com> | 2016-04-21 13:58:22 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-04-21 15:21:42 +0200 |
| commit | 6768bbfcc02e0f498110cda2ba9adbc2fd23d24c (patch) | |
| tree | 7dccb1019434582874b285276189b1b3dcbb96a9 /addons/web/static/src/js/framework/ajax.js | |
| parent | e1bfd3fbda97ac7a64a585b07be161d5be606cf9 (diff) | |
| parent | 8e440b173e3b273b3aac541f2ec12527f67dfa60 (diff) | |
[MERGE] *: stop duplicating web
Avoid duplicating web addon in enterprise by extracting a common basis.
Enterprise features stay in enterprise, but use that common basis.
In web, mainly:
- JS refactoring and linting
- Conversion of .sass into .less split into multiple files
- Templates cleaning and DOM simplification
- Re-generation of web.pot, and update of .po files
Minor tweaks in some other addons to make them work with this new structure.
Diffstat (limited to 'addons/web/static/src/js/framework/ajax.js')
| -rw-r--r-- | addons/web/static/src/js/framework/ajax.js | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/addons/web/static/src/js/framework/ajax.js b/addons/web/static/src/js/framework/ajax.js index 869e0214ad9..0301cd4e96c 100644 --- a/addons/web/static/src/js/framework/ajax.js +++ b/addons/web/static/src/js/framework/ajax.js @@ -2,8 +2,8 @@ odoo.define('web.ajax', function (require) { "use strict"; var core = require('web.core'); -var time = require('web.time'); var utils = require('web.utils'); +var time = require('web.time'); function genericJsonRpc (fct_name, params, fct) { var data = { @@ -14,6 +14,7 @@ function genericJsonRpc (fct_name, params, fct) { }; var xhr = fct(data); var result = xhr.pipe(function(result) { + core.bus.trigger('rpc:result', data, result); if (result.error !== undefined) { if (result.error.data.arguments[0] !== "bus.Bus not available in test mode") { console.error("Server application error", JSON.stringify(result.error)); @@ -42,7 +43,7 @@ function jsonRpc(url, fct_name, params, settings) { contentType: 'application/json' })); }); -}; +} function jsonpRpc(url, fct_name, params, settings) { settings = settings || {}; @@ -116,7 +117,7 @@ function jsonpRpc(url, fct_name, params, settings) { return deferred; } }); -}; +} // helper function realSetTimeout (fct, millis) { @@ -140,7 +141,7 @@ function loadCSS(url) { 'type': 'text/css' })); } -}; +} function loadJS(url) { var def = $.Deferred(); @@ -165,7 +166,7 @@ function loadJS(url) { head.appendChild(script); } return def; -}; +} /** * Cooperative file download implementation, for ajaxy APIs. @@ -301,7 +302,7 @@ function post (controller_url, data) { var Def = $.Deferred(); var postData = new FormData(); - + $.each(data, function(i,val) { postData.append(i, val); }); @@ -311,7 +312,7 @@ function post (controller_url, data) { var xhr = new XMLHttpRequest(); if(xhr.upload) xhr.upload.addEventListener('progress', progressHandler(Def), false); - + var ajaxDef = $.ajax(controller_url, { xhr: function() {return xhr;}, data: postData, @@ -324,8 +325,6 @@ function post (controller_url, data) { return Def; } - - var loadXML = (function () { var loading = false; var urls = []; |
