From 3742b1ab3f5306e0dddb3d88d540c49b5e1a5bdd Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Tue, 17 Jun 2014 15:43:56 +0200 Subject: [FIX] website: jquery attrbutes assignation is not supported by Firefox Happens when trying to change an image in a a banner block --- addons/website/static/src/js/website.editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website/static/src/js/website.editor.js') diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index fcb957cafda..6ed5f1145b8 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1504,7 +1504,7 @@ url: this.link }); this.media.renameNode("img"); - this.media.$.attributes.src = this.link; + $(this.media).attr('src', this.link); return this._super(); }, clear: function () { -- cgit v1.2.3 From ab1406cd7c100fe121b2ec027e1436be4c8d7355 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 19 Jun 2014 11:39:14 +0200 Subject: [FIX] website: ignore SVG elements when looking for edition events in RTE --- addons/website/static/src/js/website.editor.js | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'addons/website/static/src/js/website.editor.js') diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 6ed5f1145b8..0a4ed5e7d15 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1988,6 +1988,11 @@ // a/@href, ...) _(mutations).chain() .filter(function (m) { + // ignore any SVG target, these blokes are like weird mon + if (m.target && m.target instanceof SVGElement) { + return false; + } + // ignore any change related to mundane image-edit-button if (m.target && m.target.className && m.target.className.indexOf('image-edit-button') !== -1) { -- cgit v1.2.3 From 5023816c5577b312b06f04355365f1243ed2cdc9 Mon Sep 17 00:00:00 2001 From: Paramjit Singh Sahota Date: Thu, 19 Jun 2014 14:45:56 +0200 Subject: [FIX] website: correct selector The selector to toggle the theme was triggered too often (on almost each button) but had no effect because no view-id was present. Patch fix #627 --- addons/website/static/src/js/website.editor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/website/static/src/js/website.editor.js') diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index 7151987143e..e741b805566 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -436,7 +436,7 @@ } ); }); - menu.on('click', 'a[data-action!=ace]', function (event) { + menu.on('click', 'a[data-view-id]', function (event) { var view_id = $(event.currentTarget).data('view-id'); openerp.jsonRpc('/website/customize_template_toggle', 'call', { 'view_id': view_id -- cgit v1.2.3