diff options
| author | Fabien Meghazi <fme@openerp.com> | 2014-03-26 16:24:33 +0100 |
|---|---|---|
| committer | Fabien Meghazi <fme@openerp.com> | 2014-03-26 16:24:33 +0100 |
| commit | eb5cbea318478a0adfe347e8e486cd5b8643a51d (patch) | |
| tree | 3ab4f76a906c258818f37ea6997d7a1af8f58de0 /addons/website/static/src/js/website.editor.js | |
| parent | 0195f0d8170e06ab2b83aca2209034bafda4702e (diff) | |
| parent | 6ad8096210ab355fe22e7256e99ad2695d11c9c6 (diff) | |
[MERGE] upstream
bzr revid: fme@openerp.com-20140326152433-vegu5tuvr8vc1s8v
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 24c97bce311..c965c5ef834 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1790,6 +1790,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 } } |