← Back to branch summary

~openerp-dev/openerp-web/trunk-pdf_viewer-dja

« back to all changes in this revision

Viewing changes to addons/web/static/src/js/core.js

  • Committer: Fabien Meghazi
  • Date: 2014-05-06 10:36:49 UTC
  • Revision ID: fme@openerp.com-20140506103649-wrfa25boj2chy6gl
[ADD] openerp.loadBundle()

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web/static/src/js/core.js
345
345
    load_css: function (files) {
346
346
        var self = this;
347
347
        _.each(files, function (file) {
348
 
            $('head').append($('<link>', {
349
 
                'href': self.url(file, null),
350
 
                'rel': 'stylesheet',
351
 
                'type': 'text/css'
352
 
            }));
 
348
            openerp.loadCSS(self.url(file, null));
353
349
        });
354
350
    },
355
351
    load_js: function(files) {
356
352
        var self = this;
357
353
        var d = $.Deferred();
358
 
        if(files.length !== 0) {
 
354
        if (files.length !== 0) {
359
355
            var file = files.shift();
360
 
            var tag = document.createElement('script');
361
 
            tag.type = 'text/javascript';
362
 
            tag.src = self.url(file, null);
363
 
            tag.onload = tag.onreadystatechange = function() {
364
 
                if ( (tag.readyState && tag.readyState != "loaded" && tag.readyState != "complete") || tag.onload_done )
365
 
                    return;
366
 
                tag.onload_done = true;
367
 
                self.load_js(files).done(function () {
368
 
                    d.resolve();
369
 
                });
370
 
            };
371
 
            var head = document.head || document.getElementsByTagName('head')[0];
372
 
            head.appendChild(tag);
 
356
            var url = self.url(file, null);
 
357
            openerp.loadJS(url).done(d.resolve);
373
358
        } else {
374
359
            d.resolve();
375
360
        }