From 25ead2647d14c8d2c70631998e7846130c411913 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Mon, 12 May 2014 10:25:42 +0200
Subject: [PATCH] editor: improving onAfterActionExecuted canvas handler -
 handle actions returning NodeFragment

---
 src/editor/modules/documentCanvas/documentCanvas.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/editor/modules/documentCanvas/documentCanvas.js b/src/editor/modules/documentCanvas/documentCanvas.js
index 2cb3fa1..5942d8f 100644
--- a/src/editor/modules/documentCanvas/documentCanvas.js
+++ b/src/editor/modules/documentCanvas/documentCanvas.js
@@ -82,9 +82,12 @@ return function(sandbox) {
             canvas.setCurrentElement(node);
         },
         onAfterActionExecuted: function(action, ret) {
-            if(ret && ret instanceof canvas.wlxmlDocument.CaretFragment && ret.isValid()) {
+            if(ret && ret.isValid() && ret instanceof canvas.wlxmlDocument.NodeFragment) {
                 logger.debug('The action returned a valid fragment');
-                canvas.setCurrentElement(ret.node, {caretTo: ret.offset});
+                var params = {
+                    caretTo: ret instanceof canvas.wlxmlDocument.CaretFragment ? ret.offset : 'start'
+                };
+                canvas.setCurrentElement(ret.node, params);
                 return;
             }
             logger.debug('No valid fragment returned from the action');
-- 
2.20.1