diff options
| author | Kersten Jeremy <jke@openerp.com> | 2014-04-14 16:30:01 +0200 |
|---|---|---|
| committer | Kersten Jeremy <jke@openerp.com> | 2014-04-14 16:30:01 +0200 |
| commit | bafa8e448d2e5ff0f4824bf70e14cbae3ca628e0 (patch) | |
| tree | 4596218ed18021bb87f029850d1b3df11fe2c6a2 /addons | |
| parent | afc2685ceec9441eebbe856ed8ba2be38ce0d99d (diff) | |
[FIX] Website_mail - Add selectors to allow drag and drop of snippet in email template
bzr revid: jke@openerp.com-20140414143001-26p3ka7dwb1er6y0
Diffstat (limited to 'addons')
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 3 | ||||
| -rw-r--r-- | addons/website_mail/views/snippets.xml | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index f057b7b822c..e87de996a05 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -435,7 +435,6 @@ // snippet_selectors => to get selector-siblings, selector-children, selector-vertical-children $snippet = $(this); $toInsert = $snippet.find('.oe_snippet_body').clone(); - $toInsert.removeClass('oe_snippet_body'); var selector = []; var selector_siblings = []; @@ -498,6 +497,8 @@ }); }, stop: function(ev, ui){ + $toInsert.removeClass('oe_snippet_body'); + if (action === 'insert' && ! dropped && $('.oe_drop_zone') && ui.position.top > 3) { var el = $('.oe_drop_zone').nearest({x: ui.position.left, y: ui.position.top}).first(); if (el.length) { diff --git a/addons/website_mail/views/snippets.xml b/addons/website_mail/views/snippets.xml index a930f2852a1..b99be8f6d8c 100644 --- a/addons/website_mail/views/snippets.xml +++ b/addons/website_mail/views/snippets.xml @@ -481,7 +481,11 @@ </div> <div id="snippet_options" class="hidden"> - <t t-call="website.snippet_options"/> + <div data-snippet-option-id='content' + data-selector="[data-oe-field='body_html'] > div, .oe_snippet_body" + data-selector-siblings="[data-oe-field='body_html'] > *" + data-selector-children="[data-oe-field='body_html']"> + </div> </div> </div> |