summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/framework
diff options
context:
space:
mode:
authorXavier Morel <xmo@odoo.com>2015-09-25 12:40:18 +0200
committerXavier Morel <xmo@odoo.com>2016-01-11 11:32:18 +0100
commit7f8fe1076660ab949a050c04443abd160555e08a (patch)
tree585a2a6972abc6e2ea524744b61b8ef9c2932f70 /addons/web/static/src/js/framework
parent403f23782be6bbf46e51c9bd8f87e563c205c610 (diff)
[REM] web: Proxy.load
Not really useful at this point, if we ever go down the path of embedded web client we can probably make the relevant controllers CORS.
Diffstat (limited to 'addons/web/static/src/js/framework')
-rw-r--r--addons/web/static/src/js/framework/session.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/addons/web/static/src/js/framework/session.js b/addons/web/static/src/js/framework/session.js
index 7eae8b20a65..71819cc6b7a 100644
--- a/addons/web/static/src/js/framework/session.js
+++ b/addons/web/static/src/js/framework/session.js
@@ -236,14 +236,13 @@ var Session = core.Class.extend(mixins.EventDispatcherMixin, {
return d;
},
load_qweb: function(mods) {
- var self = this;
- self.qweb_mutex.exec(function() {
- return self.rpc('/web/proxy/load', {path: '/web/webclient/qweb?mods=' + mods}).then(function(xml) {
- if (!xml) { return; }
- qweb.add_template(_.str.trim(xml));
+ this.qweb_mutex.exec(function() {
+ return $.get('/web/webclient/qweb?mods=' + mods).then(function (doc) {
+ if (!doc) { return; }
+ qweb.add_template(doc);
});
});
- return self.qweb_mutex.def;
+ return this.qweb_mutex.def;
},
on_modules_loaded: function() {
var openerp = window.openerp;