Refactoring

[fnpeditor.git] / modules / documentCanvas / commands.js

diff --git a/modules/documentCanvas/commands.js b/modules/documentCanvas/commands.js
index 0c9fef0..0e48de1 100644 (file)
--- a/modules/documentCanvas/commands.js
+++ b/modules/documentCanvas/commands.js
@@ -55,6 +55,7 @@ commands.register('toggle-list', function(canvas, params) {
         parent1 = selectionStart.element.parent() || undefined,
         parent2 = selectionEnd.element.parent() || undefined;
 
         parent1 = selectionStart.element.parent() || undefined,
         parent2 = selectionEnd.element.parent() || undefined;
 

+    var selectionFocus = cursor.getSelectionFocus();

     if(params.toggle) {
         canvas.list.create({element1: parent1, element2: parent2});
     } else {
     if(params.toggle) {
         canvas.list.create({element1: parent1, element2: parent2});
     } else {


@@ -62,6 +63,7 @@ commands.register('toggle-list', function(canvas, params) {
             canvas.list.extractItems({element1: parent1, element2: parent2, merge: false});
         } 
     }
             canvas.list.extractItems({element1: parent1, element2: parent2, merge: false});
         } 
     }

+    canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});

 });
 
 commands.register('toggle-grid', function(canvas, params) {
 });
 
 commands.register('toggle-grid', function(canvas, params) {


@@ -76,17 +78,23 @@ commands.register('newNodeRequested', function(canvas, params) {
 
     if(cursor.isSelecting() && cursor.isSelectingSiblings()) {
         if(cursor.isSelectingWithinElement()) {
 
     if(cursor.isSelecting() && cursor.isSelectingSiblings()) {
         if(cursor.isSelectingWithinElement()) {

-            selectionStart.element.wrapWithNodeElement({tag: params.wlxmlTag, klass: params.wlxmlClass, start: selectionStart.offset, end: selectionEnd.offset});
+            var newElement = selectionStart.element.wrapWithNodeElement({tag: params.wlxmlTag, klass: params.wlxmlClass, start: selectionStart.offset, end: selectionEnd.offset}),
+                caretTo = selectionStart.offset < selectionEnd.offset ? 'start' : 'end';
+            canvas.setCurrentElement(newElement.children()[0], {caretTo: caretTo});

         }
         else {
         }
         else {

-            var parent = selectionStart.element.parent();
-            canvas.wrapText({
+            var parent = selectionStart.element.parent(),
+                caretTo = selectionStart.element.sameNode(cursor.getSelectionAnchor().element) ? 'end' : 'start';
+
+            var wrapper = canvas.wrapText({

                 inside: parent,
                 _with: {tag: params.wlxmlTag, klass: params.wlxmlClass},
                 offsetStart: selectionStart.offset,
                 offsetEnd: selectionEnd.offset,
                 textNodeIdx: [parent.childIndex(selectionStart.element), parent.childIndex(selectionEnd.element)]
             });
                 inside: parent,
                 _with: {tag: params.wlxmlTag, klass: params.wlxmlClass},
                 offsetStart: selectionStart.offset,
                 offsetEnd: selectionEnd.offset,
                 textNodeIdx: [parent.childIndex(selectionStart.element), parent.childIndex(selectionEnd.element)]
             });

+
+            canvas.setCurrentElement(wrapper.children()[caretTo === 0 ? 0 : wrapper.children().length - 1], {caretTo: caretTo});

         }
     }
 });
         }
     }
 });