From 8f081bf57a12544f14e278f6bfe7b4ee97f7fd84 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Wed, 7 Aug 2013 15:34:28 +0200 Subject: [PATCH 1/1] ctrl + enter creates new node element after current text element (wlxmlTag=block) --- modules/documentCanvas/canvas/canvas.js | 40 +++++++++++++++---------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/modules/documentCanvas/canvas/canvas.js b/modules/documentCanvas/canvas/canvas.js index a8ff8d4..873b39e 100644 --- a/modules/documentCanvas/canvas/canvas.js +++ b/modules/documentCanvas/canvas/canvas.js @@ -266,26 +266,34 @@ $.extend(Canvas.prototype, { if(e.which === KEYS.ENTER) { e.preventDefault(); - var cursor = canvas.getCursor(); + var cursor = canvas.getCursor(), + position = cursor.getPosition(), + element = position.element; + if(!cursor.isSelecting()) { - var position = cursor.getPosition(), - element = position.element; + if(e.ctrlKey) { + var added = element.after({tag: 'block'}); + added.append({text:''}); + canvas.setCurrentElement(added, {caretTo: 'start'}); - if(!(element.parent().parent())) { - return false; // top level element is unsplittable - } + } else { - var elements = position.element.split({offset: position.offset}), - newEmpty, - goto; + if(!(element.parent().parent())) { + return false; // top level element is unsplittable + } - if(position.offsetAtBeginning) - newEmpty = elements.first; - else if(position.offsetAtEnd) - newEmpty = elements.second; - if(newEmpty) { - goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this)); - canvas.setCurrentElement(goto); + var elements = position.element.split({offset: position.offset}), + newEmpty, + goto; + + if(position.offsetAtBeginning) + newEmpty = elements.first; + else if(position.offsetAtEnd) + newEmpty = elements.second; + if(newEmpty) { + goto = newEmpty.append(documentElement.DocumentTextElement.create({text: ''}, this)); + canvas.setCurrentElement(goto); + } } } } -- 2.20.1