summaryrefslogtreecommitdiff
path: root/addons/website/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2013-07-31 17:07:33 +0200
committerXavier Morel <xmo@openerp.com>2013-07-31 17:07:33 +0200
commitf25335df319cc5b75e3cd46f2d9ab2a8a997cebe (patch)
treef721504666cbef206eeebcf6da7597786907fcdf /addons/website/static/src
parent7c2d3a871f40c937bff43d692161fd62741a99cc (diff)
[FIX] disable ckeditor's magicline plugin (not very useful and breaks droppables)
bzr revid: xmo@openerp.com-20130731150733-mna9qoygkn6qiers
Diffstat (limited to 'addons/website/static/src')
-rw-r--r--addons/website/static/src/js/website.js13
1 files changed, 10 insertions, 3 deletions
diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js
index 4b50728aeeb..98096df28cf 100644
--- a/addons/website/static/src/js/website.js
+++ b/addons/website/static/src/js/website.js
@@ -117,7 +117,7 @@ instance.website.EditorBar = instance.web.Widget.extend({
var self = this;
$('.oe_snippet_drop').remove();
var droppable = '<div class="oe_snippet_drop"></div>';
- var $zone = $('*:not(.oe_snippet) > .container');
+ var $zone = $(':not(.oe_snippet) > .container');
$zone.before(droppable).after(droppable);
$(".oe_snippet_drop").droppable({
@@ -339,11 +339,18 @@ instance.website.RTE = instance.web.Widget.extend({
this.toggle(!!CKEDITOR.currentInstance);
},
_config: function () {
+ var removed_plugins = [
+ // remove toolbar entirely
+ 'toolbar,elementspath,resize',
+ // remove custom context menu
+ 'contextmenu,tabletools,liststyle',
+ // magicline captures mousein/mouseout => draggable does not work
+ 'magicline'
+ ];
return {
// Don't load ckeditor's style rules
stylesSet: [],
- // Remove toolbar entirely, also custom context menu
- removePlugins: 'toolbar,elementspath,resize,contextmenu,tabletools,liststyle',
+ removePlugins: removed_plugins.join(','),
uiColor: '',
// Ensure no config file is loaded
customConfig: '',