diff --git a/addons/website_sale/static/src/js/website_sale.editor.js b/addons/website_sale/static/src/js/website_sale.editor.js index b9b835dc103..c935602d83e 100644 --- a/addons/website_sale/static/src/js/website_sale.editor.js +++ b/addons/website_sale/static/src/js/website_sale.editor.js @@ -74,7 +74,7 @@ options.registry.website_sale = options.Class.extend({ var size_x = parseInt(this.$target.attr("colspan") || 1); var size_y = parseInt(this.$target.attr("rowspan") || 1); - var $size = this.$el.find('ul[name="size"]'); + var $size = this.$el.find('div[name="size"]'); var $select = $size.find('tr:eq(0) td:lt('+size_x+')'); if (size_y >= 2) $select = $select.add($size.find('tr:eq(1) td:lt('+size_x+')')); if (size_y >= 3) $select = $select.add($size.find('tr:eq(2) td:lt('+size_x+')')); @@ -85,11 +85,11 @@ options.registry.website_sale = options.Class.extend({ model: 'product.style', method: 'search_read', }).then(function (data) { - var $ul = self.$el.find('ul[name="style"]'); + var $ul = self.$el.find('div[name="style"]'); for (var k in data) { $ul.append( - $('
') - .append( $('').text(data[k]['name']) )); + $('') + .append(data[k]['name'])); } self._setActive(); }); @@ -105,13 +105,13 @@ options.registry.website_sale = options.Class.extend({ }, bind_resize: function () { var self = this; - this.$el.on('mouseenter', 'ul[name="size"] table', function (event) { + this.$el.on('mouseenter', 'div[name="size"] table', function (event) { $(event.currentTarget).addClass("oe_hover"); }); - this.$el.on('mouseleave', 'ul[name="size"] table', function (event) { + this.$el.on('mouseleave', 'div[name="size"] table', function (event) { $(event.currentTarget).removeClass("oe_hover"); }); - this.$el.on('mouseover', 'ul[name="size"] td', function (event) { + this.$el.on('mouseover', 'div[name="size"] td', function (event) { var $td = $(event.currentTarget); var $table = $td.closest("table"); var x = $td.index()+1; @@ -127,7 +127,7 @@ options.registry.website_sale = options.Class.extend({ $table.find("td").removeClass("select"); $select_td.addClass("select"); }); - this.$el.on('click', 'ul[name="size"] td', function (event) { + this.$el.on('click', 'div[name="size"] td', function (event) { var $td = $(event.currentTarget); var x = $td.index()+1; var y = $td.parent().index()+1; diff --git a/addons/website_sale/static/src/scss/website_sale.scss b/addons/website_sale/static/src/scss/website_sale.scss index 0adeff1976b..0b63585fb8b 100644 --- a/addons/website_sale/static/src/scss/website_sale.scss +++ b/addons/website_sale/static/src/scss/website_sale.scss @@ -457,7 +457,7 @@ div#payment_method { .oe_overlay_options { .dropdown { - ul[name="size"] { + div[name="size"] { table { margin-left: 20px; } diff --git a/addons/website_sale/views/snippets.xml b/addons/website_sale/views/snippets.xml index 1fb5f776501..d0e8f3cdc50 100644 --- a/addons/website_sale/views/snippets.xml +++ b/addons/website_sale/views/snippets.xml @@ -6,34 +6,30 @@