summaryrefslogtreecommitdiff
path: root/addons/website/static/src/js/website.theme.js
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2015-08-25 16:03:51 +0200
committerJeremy Kersten <jke@odoo.com>2015-08-26 15:31:28 +0200
commitb44749f8d52fd074d5cc96452365ffb7f9603d27 (patch)
treeb37f9d7eb05296b677f26a216f625070db1aa208 /addons/website/static/src/js/website.theme.js
parentaf07b2a07587d83a67928cf30dd9172f2c870cb7 (diff)
[IMP] website.theme: add event into the on_select arguments to allow the prevent default
Diffstat (limited to 'addons/website/static/src/js/website.theme.js')
-rw-r--r--addons/website/static/src/js/website.theme.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/addons/website/static/src/js/website.theme.js b/addons/website/static/src/js/website.theme.js
index 1ad82af7dd4..55498475052 100644
--- a/addons/website/static/src/js/website.theme.js
+++ b/addons/website/static/src/js/website.theme.js
@@ -20,10 +20,10 @@
template: 'website.theme_customize',
events: {
'change input[data-xmlid],input[data-enable],input[data-disable]': 'change_selection',
- 'click label:has(input[data-xmlid],input[data-enable],input[data-disable])': function (event) {
+ 'mousedown label:has(input[data-xmlid],input[data-enable],input[data-disable])': function (event) {
var self = this;
this.time_select = _.defer(function () {
- self.on_select($(event.target).find('input'));
+ self.on_select($(event.target).find('input'), event);
});
},
'click .close': 'close',
@@ -189,7 +189,7 @@
if (this.$el.hasClass("loading")) return; // prevent to change selection when css is loading
- var $option = $(event.target),
+ var $option = $(event.target).is('input') ? $(event.target) : $("input", event.target),
$options = $option,
checked = $option.prop("checked");
@@ -243,13 +243,13 @@
clearTimeout(this.timer);
if (this.flag) {
this.timer = _.defer(function () {
- if (!init_mode) self.on_select($options);
+ if (!init_mode) self.on_select($options, event);
self.update_style(self.get_xml_ids($enable), self.get_xml_ids($disable), self.reload);
self.reload = false;
});
} else {
this.timer = _.defer(function () {
- if (!init_mode) self.on_select($options);
+ if (!init_mode) self.on_select($options, event);
self.reload = false;
});
}
@@ -257,9 +257,8 @@
/* Method call when the user change the selection or click on an input
* @values: all changed inputs
*/
- on_select: function ($inputs) {
+ on_select: function ($inputs, event) {
clearTimeout(this.time_select);
- console.log($inputs.get());
},
click: function (event) {
if (!$(event.target).closest("#theme_customize_modal > *").length) {