From 0b89e99ee683a4104d07b0756e090becaa52ad9c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Thu, 27 Jun 2013 15:10:49 +0200
Subject: [PATCH 1/1] Fixing returning from source to visual editor after edit

---
 modules/documentCanvas/canvasManager.js  | 2 ++
 modules/documentCanvas/documentCanvas.js | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
index 7e34e29..b6a316e 100644
--- a/modules/documentCanvas/canvasManager.js
+++ b/modules/documentCanvas/canvasManager.js
@@ -159,6 +159,8 @@ Manager.prototype.selectFirstNode = function() {
 };
 
 Manager.prototype.movecaretToNode = function(nodeElement, where) {
+    if(!nodeElement.length)
+        return;
     var range = document.createRange();
     range.selectNodeContents(nodeElement[0]);
     
diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index a4dcf37..4ca0a4d 100644
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -25,7 +25,7 @@ return function(sandbox) {
             sandbox.publish('documentSet');
         },
         getDocument: function() {
-            return canvas.toXML();
+            return transformations.toXML.getXML(canvas.getContent())
         },
         modifyCurrentNode: function(attr, value) {
             if(manager.currentNode) {
-- 
2.20.1