[REF] web_planner: javascript & dom cleaning

* Correct inheritance of async method
* Correct calls to do_hide/show
* Fetch the template in `willStart`
* Correct bootstrap structure for the layout, remove useless branding
  and dom depth
* Each planner page is now in its own bootstrap grid
* Compatibility between both webclients

1 files changed, 10 insertions, 20 deletions

diff --git a/addons/website/static/src/js/web_planner_website.js b/addons/website/static/src/js/web_planner_website.js
index 69d385a9032..1042fb4df6d 100644
--- a/addons/website/static/src/js/web_planner_website.js
+++ b/addons/website/static/src/js/web_planner_website.js
@@ -6,7 +6,7 @@ var core = require('web.core');
 var Model = require('web.Model');
 var Widget = require('web.Widget');
 var planner = require('web.planner.common');
-var base = require('web_editor.base');
+require('web_editor.base');  // wait for implicit dependencies to load
 
 var qweb = core.qweb;
 
@@ -14,17 +14,15 @@ if(!$('#oe_systray').length) {
     return $.Deferred().reject("DOM doesn't contain '#oe_systray'");
 }
 
-var PlannerDialog = planner.PlannerDialog;
-
-planner.WebsitePlannerLauncher = Widget.extend({
+var WebsitePlannerLauncher = Widget.extend({
     template: "PlannerLauncher",
     events: {
         'click .o_planner_progress': 'toggle_dialog'
     },
     start: function() {
         var self = this;
-        this._super.apply(this, arguments);
-        return this.get_website_planner().then(function(planner) {
+        var res = this._super.apply(this, arguments);
+        return res.then(this.get_website_planner.bind(this)).then(function(planner) {
             if (planner.length) {
                 self.planner = planner[0];
                 self.planner.data = $.parseJSON(planner[0].data) || {};
@@ -37,33 +35,25 @@ planner.WebsitePlannerLauncher = Widget.extend({
     },
     setup: function() {
         var self = this;
-        this.dialog = new PlannerDialog(this, this.planner);
+        this.dialog = new planner.PlannerDialog(this, this.planner);
+        this.dialog.appendTo(document.body);
         this.$(".o_planner_progress").tooltip({html: true, title: this.planner.tooltip_planner, placement: 'bottom', container: 'body', delay: {'show': 700}});
         this.dialog.on("planner_progress_changed", this, function(percent) {
             self.update_parent_progress_bar(percent);
         });
-        this.dialog.appendTo(document.body);
     },
     update_parent_progress_bar: function(percent) {
         this.$(".progress-bar").css('width', percent+"%");
     },
     toggle_dialog: function() {
-        this.dialog.$el.toggle();
+        this.dialog.do_toggle();
     },
 });
 
-PlannerDialog.include({
-    prepare_planner_event: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-        self.$el.on("click", ".o_planner a.o_planner_hide", function(ev) {
-            self.$('#PlannerModal').modal('hide');
+return ajax.loadXML('/web_planner/static/src/xml/web_planner.xml', qweb).then(function() {
+            var websitePlannerLauncher = new WebsitePlannerLauncher();
+            websitePlannerLauncher.prependTo($('#oe_systray'));
         });
-    }
-});
 
-return ajax.loadXML('/web_planner/static/src/xml/web_planner.xml', qweb).then(function() {
-    new planner.WebsitePlannerLauncher().prependTo($('#oe_systray'));
 });
 
-});