diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-05-06 12:36:49 +0200 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-05-06 12:36:49 +0200 |
| commit | c033b660e8f6d7863ca51852cbb059f710eaca26 (patch) | |
| tree | 1df46e03d29eac5af9f6992c1b845c7967402a23 /addons/web/static/src/js/core.js | |
| parent | 2b67c9c77bd9259033a0b963632f8350c4237fcb (diff) | |
[ADD] openerp.loadBundle()
bzr revid: fme@openerp.com-20140506103649-wrfa25boj2chy6gl
Diffstat (limited to 'addons/web/static/src/js/core.js')
| -rw-r--r-- | addons/web/static/src/js/core.js | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index c64da7e5810..29f6c3e4d9e 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -345,31 +345,16 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ load_css: function (files) { var self = this; _.each(files, function (file) { - $('head').append($('<link>', { - 'href': self.url(file, null), - 'rel': 'stylesheet', - 'type': 'text/css' - })); + openerp.loadCSS(self.url(file, null)); }); }, load_js: function(files) { var self = this; var d = $.Deferred(); - if(files.length !== 0) { + if (files.length !== 0) { var file = files.shift(); - var tag = document.createElement('script'); - tag.type = 'text/javascript'; - tag.src = self.url(file, null); - tag.onload = tag.onreadystatechange = function() { - if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done ) - return; - tag.onload_done = true; - self.load_js(files).done(function () { - d.resolve(); - }); - }; - var head = document.head || document.getElementsByTagName('head')[0]; - head.appendChild(tag); + var url = self.url(file, null); + openerp.loadJS(url).done(d.resolve); } else { d.resolve(); } |
