From 9bee25a9df65f657fef0f2f32a7ad823fdc7d4e1 Mon Sep 17 00:00:00 2001 From: Aaron Bohy Date: Wed, 29 Nov 2017 14:39:42 +0100 Subject: [REF] account,web(_tour): close rainbowman on click This rev. makes the Rainbowman stop listening to event 'clear_uncommitted_changes' on core.bus, as this event is about to be removed (in a next commit). It was using it to destroy itself when such an event was triggered (basically, when the current view was left). Instead, we removed the option 'click_close' as, when set to true, which was the default, the rainbowman was destroyed as soon as the user clicked outside the raibowman. --- addons/web/static/src/js/widgets/rainbow_man.js | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) (limited to 'addons/web/static/src/js/widgets/rainbow_man.js') diff --git a/addons/web/static/src/js/widgets/rainbow_man.js b/addons/web/static/src/js/widgets/rainbow_man.js index 16d4d9a1e3d..e46201584bc 100644 --- a/addons/web/static/src/js/widgets/rainbow_man.js +++ b/addons/web/static/src/js/widgets/rainbow_man.js @@ -33,8 +33,6 @@ var RainbowMan = Widget.extend({ * [options.fadeout='no'] will keep rainbowman on screen until user clicks * anywhere outside rainbowman * @param {string} [options.img_url] URL of the image to be displayed - * @param {boolean} [options.click_close=true] If true, destroys rainbowman on - * click outside */ init: function (options) { this._super.apply(this, arguments); @@ -43,23 +41,19 @@ var RainbowMan = Widget.extend({ fadeout: 'medium', img_url: '/web/static/src/img/smile.svg', message: _t('Well Done!'), - click_close: true, }); this.delay = rainbowDelay[this.options.fadeout]; - core.bus.on('clear_uncommitted_changes', this, this.destroy); }, /** * @override */ start: function () { var self = this; - if (this.options.click_close) { - core.bus.on('click', this, function (ev) { - if (ev.originalEvent && ev.target.className.indexOf('o_reward') === -1) { - this.destroy(); - } - }); - } + core.bus.on('click', this, function (ev) { + if (ev.originalEvent && ev.target.className.indexOf('o_reward') === -1) { + this.destroy(); + } + }); if (this.delay) { setTimeout(function () { self.$el.addClass('o_reward_fading'); -- cgit v1.2.3