summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorchm@openerp.com <>2014-03-31 15:33:40 +0200
committerchm@openerp.com <>2014-03-31 15:33:40 +0200
commite0d33ad3c56cf627a0dc0d86f689fd4ec1eb3519 (patch)
treeccb08ba4a36054c688f932f22a74312dd6fdf719 /addons/website/static/src
parente81c205b188c8223b42250f4bba4b6da880021e0 (diff)
[FIX] website editor: shop tour and media editor for field image
bzr revid: chm@openerp.com-20140331133340-vj67s9hlptum0h19
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.editor.js4
-rw-r--r--addons/website/static/src/js/website.snippets.editor.js9
2 files changed, 13 insertions, 0 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js
index ffbc5ee41e8..2de0e92b8db 100644
--- a/addons/website/static/src/js/website.editor.js
+++ b/addons/website/static/src/js/website.editor.js
@@ -1366,6 +1366,10 @@
this.$('[href="#editor-media-icon"]').tab('show');
}
+ if ($(this.media.$).parent().data("oe-field") === "image") {
+ this.$('[href="#editor-media-video"], [href="#editor-media-icon"]').addClass('hidden');
+ }
+
return this._super();
},
save: function () {
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js
index 59e624ce435..0febdb2bedd 100644
--- a/addons/website/static/src/js/website.snippets.editor.js
+++ b/addons/website/static/src/js/website.snippets.editor.js
@@ -1494,6 +1494,15 @@
new website.editor.MediaDialog(self, self.element).appendTo(document.body);
});
},
+ onFocus : function () {
+ var self = this;
+ if (this.$target.parent().data("oe-field") === "image") {
+ this.$overlay.addClass("hidden");
+ self.element = new CKEDITOR.dom.element(self.$target[0]);
+ new website.editor.MediaDialog(self, self.element).appendTo(document.body);
+ self.BuildingBlock.make_active(false);
+ }
+ },
});