pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] web: module can be asynchronous loaded if it return a deferred

Browse Source 
Each module can return a deferred. In that case, the module is marked as loaded
only when the deferred is resolved, and its value is equal to the resolved value.
The module can be rejected (unloaded). This will be logged in the console as info.

Remove if_dom_contains from the website, the modules return a rejected deferred if
the DOM doesn't contains the seleted values.
This commit is contained in:
Christophe Matthieu
2015-07-22 12:15:24 +02:00
parent dfad968515
commit 71732dceb6
21 changed files with 182 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/website/static/src/js/web_planner_website.js
+7 -7
View File
@@ -10,9 +10,13 @@ var base = require('web_editor.base');
var qweb = core.qweb;
if(!$('#oe_systray').length) {
return $.Deferred().reject("DOM doesn't contain '#oe_systray'");
}
var PlannerDialog = planner.PlannerDialog;
planner.WebistePlannerLauncher = Widget.extend({
planner.WebsitePlannerLauncher = Widget.extend({
template: "PlannerLauncher",
events: {
'click .o_planner_progress': 'toggle_dialog'
@@ -58,12 +62,8 @@ PlannerDialog.include({
}
});
base.dom_ready.done(function() {
if($('#oe_systray').length) {
ajax.loadXML('/web_planner/static/src/xml/web_planner.xml', qweb).then(function() {
new planner.WebistePlannerLauncher().prependTo($('#oe_systray'));
});
}
return ajax.loadXML('/web_planner/static/src/xml/web_planner.xml', qweb).then(function() {
new planner.WebsitePlannerLauncher().prependTo($('#oe_systray'));
});
});
addons/website/static/src/js/website.js
+3 -21
View File
@@ -23,6 +23,7 @@ browser += ","+$.browser.version;
if (/android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini/i.test(navigator.userAgent.toLowerCase())) browser += ",mobile";
document.documentElement.setAttribute('data-browser', browser);
/* ----------------------------------------------------
Helpers
---------------------------------------------------- */
@@ -216,22 +217,6 @@ var init_kanban = function ($kanban) {
ajax.loadXML('/website/static/src/xml/website.xml', qweb);
/**
* Execute a function if the dom contains at least one element matched
* through the given jQuery selector. Will first wait for the dom to be ready.
*
* @param {String} selector A jQuery selector used to match the element(s)
* @param {Function} fn Callback to execute if at least one element has been matched
*/
var if_dom_contains = function(selector, fn) {
base.dom_ready.then(function () {
var elems = $(selector);
if (elems.length) {
fn(elems);
}
});
};
/**
* Cancel the auto run of Tour (test) and launch the tour after tob bar all bind events
*/
@@ -249,8 +234,7 @@ base.ready().then(function () {
* Returns a deferred resolved when the templates are loaded
* and the Widgets can be instanciated.
*/
base.dom_ready.then(function () {
/* ----- PUBLISHING STUFF ---- */
$(document).on('click', '.js_publish_management .js_publish_btn', function () {
var $data = $(this).parents(".js_publish_management:first");
@@ -305,7 +289,6 @@ base.dom_ready.then(function () {
window.document.body.scrollTop = +location.hash.match(/scrollTop=([0-9]+)/)[1];
}
},0);
});
/**
@@ -329,7 +312,6 @@ var TopBar = Widget.extend({
var data = {
prompt: prompt,
form: form,
if_dom_contains: if_dom_contains,
TopBar: TopBar,
ready: function () {
console.warn("website.ready is deprecated: Please use require('web_editor.base').ready()");
@@ -341,5 +323,5 @@ return data;
});
$(function () {
odoo.init();
_.defer(odoo.init);
});