editor: improving onAfterActionExecuted canvas handler - handle actions returning...

diff --git a/src/editor/modules/documentCanvas/documentCanvas.js b/src/editor/modules/documentCanvas/documentCanvas.js
index 2cb3fa1..5942d8f 100644 (file)
--- 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) {
             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');
                 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');
                 return;
             }
             logger.debug('No valid fragment returned from the action');