odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] web_preload js part 

bzr revid: al@openerp.com-20110927111402-teb8bpavj4atghle
This commit is contained in:
Antony Lesuisse 2011-09-27 13:14:02 +02:00
parent 8b2f8e1c88 6b8d98b54a
commit 5dfc14d359
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/controllers/main.py
View File

@ -119,7 +119,7 @@ home_template = textwrap.dedent("""<!DOCTYPE html>
%(javascript)s %(javascript)s
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
var c = new openerp.init(); var c = new openerp.init(%(modules)s);
var wc = new c.web.WebClient("oe"); var wc = new c.web.WebClient("oe");
wc.start(); wc.start();
}); });
@ -166,9 +166,11 @@ class WebClient(openerpweb.Controller):
if req.debug: if req.debug:
csslist = [i + '?debug=' + str(time.time()) for i in manifest_glob(None, 'css')] csslist = [i + '?debug=' + str(time.time()) for i in manifest_glob(None, 'css')]
css = "\n ".join(['<link rel="stylesheet" href="%s">'%i for i in csslist]) css = "\n ".join(['<link rel="stylesheet" href="%s">'%i for i in csslist])
r = home_template % { r = home_template % {
'javascript': js, 'javascript': js,
'css': css 'css': css,
'modules': simplejson.dumps(manifest_preload()),
} }
return r return r

9
addons/web/static/src/js/boot.js
View File

@ -19,9 +19,9 @@
/** /**
* OpenERP instance constructor * OpenERP instance constructor
* *
* @param {Boolean} skip_init if true, skips the built-in initialization * @param {Array} modules list of modules to initialize
*/ */
init: function(skip_init) { init: function(modules) {
var new_instance = { var new_instance = {
// links to the global openerp // links to the global openerp
_openerp: openerp, _openerp: openerp,
@ -35,8 +35,9 @@
web_mobile: {} web_mobile: {}
}; };
openerp.sessions[new_instance._session_id] = new_instance; openerp.sessions[new_instance._session_id] = new_instance;
if (!skip_init){ modules = modules || ["web"];
openerp.web(new_instance); for(var i=0; i < modules.length; i++) {
openerp[modules[i]](new_instance);
} }
return new_instance; return new_instance;
} }

1
addons/web_hello/__openerp__.py
View File

@ -5,4 +5,5 @@
"js": ["static/*/*.js", "static/*/js/*.js"], "js": ["static/*/*.js", "static/*/js/*.js"],
"css": [], "css": [],
'active': False, 'active': False,
'web_preload': True,
} }

7
addons/web_hello/static/openerp/base_hello.js
View File

@ -13,6 +13,13 @@ openerp.web.SearchView = openerp.web.SearchView.extend({
// here you may tweak globals object, if any, and play with on_* or do_* callbacks on them // here you may tweak globals object, if any, and play with on_* or do_* callbacks on them
openerp.web.Login = openerp.web.Login.extend({
start: function() {
console.log('Hello there');
this._super.apply(this,arguments);
}
});
}; };
// vim:et fdc=0 fdl=0: // vim:et fdc=0 fdl=0: