local changes from server

[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 651788e..a440bb9 100644 (file)
--- a/src/editor/modules/documentCanvas/documentCanvas.js
+++ b/src/editor/modules/documentCanvas/documentCanvas.js
@@ -20,7 +20,9 @@ return function(sandbox) {
         canvasElements = canvasElements.concat(plugin.canvasElements || []);
     });
 
         canvasElements = canvasElements.concat(plugin.canvasElements || []);
     });
 

-    var canvas = canvas3.fromXMLDocument(null, canvasElements);
+    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,


@@ -72,17 +74,8 @@ return function(sandbox) {
             canvas.loadWlxmlDocument(wlxmlDocument);
             canvasWrapper.find('#rng-module-documentCanvas-contentWrapper').empty().append(canvas.view());
         },
             canvas.loadWlxmlDocument(wlxmlDocument);
             canvasWrapper.find('#rng-module-documentCanvas-contentWrapper').empty().append(canvas.view());
         },

-        highlightElement: function(node) {
-            canvas.toggleElementHighlight(node, true);
-        },
-        dimElement: function(node) {
-            canvas.toggleElementHighlight(node, false);
-        },
-        jumpToElement: function(node) {
-            canvas.setCurrentElement(node);
-        },

         onAfterActionExecuted: function(action, ret) {
         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);
             }