Fixing returning from source to visual editor after edit

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
index 7e34e29..b6a316e 100644 (file)
--- a/modules/documentCanvas/canvasManager.js
+++ b/modules/documentCanvas/canvasManager.js
@@ -159,6 +159,8 @@ Manager.prototype.selectFirstNode = function() {
 };\r
 \r
 Manager.prototype.movecaretToNode = function(nodeElement, where) {\r
+    if(!nodeElement.length)\r
+        return;\r
     var range = document.createRange();\r
     range.selectNodeContents(nodeElement[0]);\r
     \r

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index a4dcf37..4ca0a4d 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -25,7 +25,7 @@ return function(sandbox) {
             sandbox.publish('documentSet');\r
         },\r
         getDocument: function() {\r
-            return canvas.toXML();\r
+            return transformations.toXML.getXML(canvas.getContent())\r
         },\r
         modifyCurrentNode: function(attr, value) {\r
             if(manager.currentNode) {\r