projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
86c2821
)
[FIX] load modules when all css/qweb/js files are loaded
author
Christophe Simonis
<chs@openerp.com>
Thu, 12 Jan 2012 11:21:38 +0000
(12:21 +0100)
committer
Christophe Simonis
<chs@openerp.com>
Thu, 12 Jan 2012 11:21:38 +0000
(12:21 +0100)
bzr revid: chs@openerp.com-
20120112112138
-gwxicn1zp5kkvsa9
addons/web/static/src/js/core.js
patch
|
blob
|
history
diff --git
a/addons/web/static/src/js/core.js
b/addons/web/static/src/js/core.js
index
d5c096d
..
0584c49
100644
(file)
--- a/
addons/web/static/src/js/core.js
+++ b/
addons/web/static/src/js/core.js
@@
-695,6
+695,7
@@
openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
});
})
).then(function() {
+ self.on_modules_loaded();
self.on_session_valid();
});
});
@@
-728,7
+729,6
@@
openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
var head = document.head || document.getElementsByTagName('head')[0];
head.appendChild(tag);
} else {
- self.on_modules_loaded();
d.resolve();
}
return d;