diff options
| author | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-03-28 18:48:34 +0530 |
|---|---|---|
| committer | Darshan Kalola (OpenERP) <dka@tinyerp.com> | 2014-03-28 18:48:34 +0530 |
| commit | 92875602b49c7c089be597c1947c19c1306522e4 (patch) | |
| tree | bc03b9c879434ba309737a9f80b6f36568d7a98c /addons/website/static/src/js/website.editor.js | |
| parent | 9950cdde149405770c94cd63505e0e8312bef2b9 (diff) | |
| parent | a224b88d80bc5311a684a6ae59e8584a2eec9150 (diff) | |
[MERGE]sync with trunk.
bzr revid: dka@tinyerp.com-20140328131834-1bhu74vaihxvp0sb
Diffstat (limited to 'addons/website/static/src/js/website.editor.js')
| -rw-r--r-- | addons/website/static/src/js/website.editor.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/website/static/src/js/website.editor.js b/addons/website/static/src/js/website.editor.js index c89bf9ec2fb..c965c5ef834 100644 --- a/addons/website/static/src/js/website.editor.js +++ b/addons/website/static/src/js/website.editor.js @@ -1500,7 +1500,8 @@ args: [], kwargs: { fields: ['name', 'website_url'], - domain: [['res_model', '=', 'ir.ui.view']], + domain: [['res_model', '=', 'ir.ui.view'], '|', + ['mimetype', '=', false], ['mimetype', '=like', 'image/%']], order: 'id desc', context: website.get_context(), } @@ -1789,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 } } |