Setting caret after removing list completely

diff --git a/modules/documentCanvas/commands.js b/modules/documentCanvas/commands.js
index b0fb093..0e48de1 100644 (file)
--- a/modules/documentCanvas/commands.js
+++ b/modules/documentCanvas/commands.js
@@ -55,15 +55,15 @@ commands.register('toggle-list', function(canvas, params) {
         parent1 = selectionStart.element.parent() || undefined,
         parent2 = selectionEnd.element.parent() || undefined;
 
+    var selectionFocus = cursor.getSelectionFocus();
     if(params.toggle) {
-        var selectionFocus = cursor.getSelectionFocus();
         canvas.list.create({element1: parent1, element2: parent2});
-        canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
     } else {
         if(canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
             canvas.list.extractItems({element1: parent1, element2: parent2, merge: false});
         } 
     }
+    canvas.setCurrentElement(selectionFocus.element, {caretTo: selectionFocus.offset});
 });
 
 commands.register('toggle-grid', function(canvas, params) {