diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-01-12 15:30:29 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-01-12 15:30:29 +0100 |
| commit | 7fa6f73302709d7e7b6b19ebd16d338b3dd0e2db (patch) | |
| tree | 1487b6fe232e0b9477a6e68018d5bc5d3432372f /addons/website/static/src | |
| parent | 2a834c22b0570b3a0d5ec5b4a8a0b378e3a6e12b (diff) | |
| parent | cb79297a41b7747a9318fd4794dce422ee931060 (diff) | |
[MERGE] forward port of branch 9.0 up to cb79297
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/web_planner_website.js | 1 | ||||
| -rw-r--r-- | addons/website/static/src/js/website.js | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/addons/website/static/src/js/web_planner_website.js b/addons/website/static/src/js/web_planner_website.js index 3ff34b367da..835e26594f7 100644 --- a/addons/website/static/src/js/web_planner_website.js +++ b/addons/website/static/src/js/web_planner_website.js @@ -19,6 +19,7 @@ var WebsitePlannerLauncher = Widget.extend({ start: function() { var self = this; var res = this._super.apply(this, arguments); + this.$('.progress').show(); return res.then(this.get_website_planner.bind(this)).then(function(planner) { self.$el.on('click', self, self.show_dialog.bind(self)); if (planner.length) { diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index 821223967c1..7c2ad6cc48c 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -112,14 +112,17 @@ var prompt = function (options, _qweb) { dialog.modal('show'); field.focus(); dialog.on('click', '.btn-primary', function () { + var backdrop = $('.modal-backdrop'); def.resolve(field.val(), field, dialog); dialog.modal('hide').remove(); + backdrop.remove(); }); }); dialog.on('hidden.bs.modal', function () { + var backdrop = $('.modal-backdrop'); def.reject(); dialog.remove(); - $('.modal-backdrop').remove(); + backdrop.remove(); }); if (field.is('input[type="text"], select')) { field.keypress(function (e) { |