diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-11-27 16:24:24 +0100 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-11-27 16:24:24 +0100 |
| commit | 0759dcb6c0d336c033b3ec95cee4415fd024e8eb (patch) | |
| tree | a5118986ecaa32e1f095290e7663125bfd0a1066 /addons/website/static/src | |
| parent | 256269242ab0efd952bab96bae3b7382a70a954b (diff) | |
| parent | ec17291b199c9f3834c23e5982d298964ed61cbe (diff) | |
[MERGE] Sync with website-al
bzr revid: tde@openerp.com-20131127152424-wq2gje9d01t2kw34
Diffstat (limited to 'addons/website/static/src')
| -rw-r--r-- | addons/website/static/src/js/website.snippets.editor.js | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/addons/website/static/src/js/website.snippets.editor.js b/addons/website/static/src/js/website.snippets.editor.js index 73691ad65d5..ac3c38a8278 100644 --- a/addons/website/static/src/js/website.snippets.editor.js +++ b/addons/website/static/src/js/website.snippets.editor.js @@ -324,14 +324,12 @@ } }, out: function(){ - if( action === 'insert'){ + var prev = $toInsert.prev(); + if( action === 'insert' && this === prev[0]){ dropped = false; $toInsert.detach(); } - }, - drop: function(){ - dropped = true; - }, + } }); }, stop: function(ev, ui){ |