diff options
| author | Christophe Simonis <chs@openerp.com> | 2014-03-24 14:38:11 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2014-03-24 14:38:11 +0100 |
| commit | d93b79e6f4e5c6c2fda65fbf88df8e1851b6fa4d (patch) | |
| tree | f855bc221056bf09cd4713d6cd44ab6b1449a268 /addons/website/static/src/js/website.editor.js | |
| parent | 7c4557add24726f34fec3aa834c34fa5c9b1f17f (diff) | |
| parent | f4b1d23cf2b44521456b479c1038e17d5ee0bac8 (diff) | |
[MERGE] forward port of branch saas-3 up to revid 9345 dle@openerp.com-20140324110349-e82t1bmmtjqbl85k
bzr revid: chs@openerp.com-20140324133811-4az1kvbznd26seow
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index c89bf9ec2fb..ae126ad16ab 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1789,6 +1789,9 @@ if (node.nodeName === 'BR' && node.getAttribute('type') === '_moz') { // <br type="_moz"> appears when focusing RTE in FF, ignore continue; + } else if (node.nodeName === 'DIV' && $(node).hasClass('oe_drop_zone')) { + // ignore dropzone inserted by snippets + continue } } |