summaryrefslogtreecommitdiff
path: root/addons/web_editor/static/lib
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2016-06-23 11:45:17 +0200
committerChristophe Matthieu <chm@odoo.com>2016-06-23 11:45:17 +0200
commit025263d3bfe568ae862fdb227b1a39b079a456fc (patch)
tree4464702cbe21fcca42b9ef20ad633a6d44c1190f /addons/web_editor/static/lib
parent2e785a886905333758497150b17b0df1d0ef66d6 (diff)
Revert "[FIX] web_editor: test jinja content to load editor in codeview"
This reverts commit f38f8930f0436a40f675fa1d054a9d46f550d440. Revert for internal choice. Odoo want to use qweb in template and remove jinja support on next version. If users want to use jinja they can change the view to use text widget instead of html widget.
Diffstat (limited to 'addons/web_editor/static/lib')
-rw-r--r--addons/web_editor/static/lib/summernote/src/js/EventHandler.js2
-rw-r--r--addons/web_editor/static/lib/summernote/src/js/summernote.js1
2 files changed, 1 insertions, 2 deletions
diff --git a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
index bc605228f54..09a7b00082a 100644
--- a/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
+++ b/addons/web_editor/static/lib/summernote/src/js/EventHandler.js
@@ -234,7 +234,7 @@ define([
var hToolbarAndPopoverClick = function (event) {
var $btn = $(event.target).closest('[data-event]');
- if (!$btn.length || $btn.hasClass('disabled')) {
+ if (!$btn.length) {
return;
}
diff --git a/addons/web_editor/static/lib/summernote/src/js/summernote.js b/addons/web_editor/static/lib/summernote/src/js/summernote.js
index f6b4277ac83..329ba7fa126 100644
--- a/addons/web_editor/static/lib/summernote/src/js/summernote.js
+++ b/addons/web_editor/static/lib/summernote/src/js/summernote.js
@@ -221,7 +221,6 @@ define([
var layoutInfo = renderer.layoutInfoFromHolder($holder);
$holder.data('layoutInfo', layoutInfo);
- layoutInfo.editable().data('options', options);
eventHandler.attach(layoutInfo, options);
eventHandler.attachCustomEvent(layoutInfo, options);