From 2c49630a8bf3c7d7f0974dc2d58d61e2e11eef24 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 1 Oct 2013 16:38:17 +0200 Subject: [PATCH] [FIX] website: some fixes for firefox bzr revid: chm@openerp.com-20131001143817-mu7lkvuwfip2fz2u --- addons/website/static/src/js/website.snippets.js | 11 +++++++---- addons/website/static/src/xml/website.snippets.xml | 3 +-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/website/static/src/js/website.snippets.js b/addons/website/static/src/js/website.snippets.js index d8b8f6b5eab..9d0c0242b5c 100644 --- a/addons/website/static/src/js/website.snippets.js +++ b/addons/website/static/src/js/website.snippets.js @@ -8,8 +8,8 @@ start: function () { var self = this; $("[data-oe-model]").on('click', function (event) { - var tag = event.srcElement.tagName.toLowerCase(); var $this = $(event.srcElement); + var tag = $this[0].tagName.toLowerCase(); if (!(tag === 'a' || tag === "button") && !$this.parents("a, button").length) { self.$('[data-action="edit"]').parent().effect('bounce', {distance: 18, times: 5}, 250); } @@ -824,7 +824,8 @@ var editor = new website.editor.ImageDialog(); editor.on('start', self, function (o) {o.url = bg_value;}); editor.on('save', self, function (o) { - (typeof bg == 'string' ? self.$target.find(bg) : $(bg)).css("background-image", "url('" + o.url + "')"); + var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg); + $bg.css("background-image", "url('" + o.url + "')"); }); editor.appendTo($('body')); } @@ -832,12 +833,14 @@ .on('mouseover', function (event) { if ($(this).data("value")) { var src = $(this).data("value"); - (typeof bg == 'string' ? self.$target.find(bg) : $(bg)).css("background-image", "url('" + src + "')"); + var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg); + $bg.css("background-image", "url('" + src + "')"); } }) .on('mouseout', function (event) { var src = $ul.find('li.active').data("value"); - (typeof bg == 'string' ? self.$target.find(bg) : $(bg)).css("background-image", "url('" + src + "')"); + var $bg = typeof bg == 'string' ? self.$target.find(bg) : $(bg); + $bg.css("background-image", "url('" + src + "')"); }); }, }); diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml index db3f551d963..ae5d544d41b 100644 --- a/addons/website/static/src/xml/website.snippets.xml +++ b/addons/website/static/src/xml/website.snippets.xml @@ -167,8 +167,7 @@