prevent empty span in a new node

[fnpeditor.git] / src / editor / modules / documentCanvas / documentCanvas.js

diff --git a/src/editor/modules/documentCanvas/documentCanvas.js b/src/editor/modules/documentCanvas/documentCanvas.js
index d88e698..a440bb9 100644 (file)
--- a/src/editor/modules/documentCanvas/documentCanvas.js
+++ b/src/editor/modules/documentCanvas/documentCanvas.js
@@ -22,7 +22,7 @@ return function(sandbox) {
 
     var canvas = canvas3.fromXMLDocument(null, canvasElements, {
         user: sandbox.getConfig().user
 
     var canvas = canvas3.fromXMLDocument(null, canvasElements, {
         user: sandbox.getConfig().user

-    });
+    }, sandbox);

     var canvasWrapper = $(template);
     var shownAlready = false;
     var scrollbarPosition = 0,
     var canvasWrapper = $(template);
     var shownAlready = false;
     var scrollbarPosition = 0,


@@ -75,7 +75,7 @@ return function(sandbox) {
             canvasWrapper.find('#rng-module-documentCanvas-contentWrapper').empty().append(canvas.view());
         },
         onAfterActionExecuted: function(action, ret) {
             canvasWrapper.find('#rng-module-documentCanvas-contentWrapper').empty().append(canvas.view());
         },
         onAfterActionExecuted: function(action, ret) {

-            if(ret && ret.isValid()) {
+            if(ret && ret.isValid && ret.isValid()) {

                 logger.debug('The action returned a valid fragment');
                 return canvas.select(ret);
             }
                 logger.debug('The action returned a valid fragment');
                 return canvas.select(ret);
             }