X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/fc54b1e72b7ed4992bbc4a2ef3ae7f02393d174d..2b589ff1348083317b6fba787c1b4fd61eecf8c9:/src/editor/modules/documentCanvas/documentCanvas.js?ds=inline

diff --git a/src/editor/modules/documentCanvas/documentCanvas.js b/src/editor/modules/documentCanvas/documentCanvas.js
index 03b0cf7..7e70f7f 100644
--- a/src/editor/modules/documentCanvas/documentCanvas.js
+++ b/src/editor/modules/documentCanvas/documentCanvas.js
@@ -14,13 +14,15 @@ var logger = logging.getLogger('documentCanvas');
 
 return function(sandbox) {
 
-    var canvasElements;
+    var canvasElements = [];
 
-    sandbox.getPlugins(function(plugin) {
+    sandbox.getPlugins().forEach(function(plugin) {
         canvasElements = canvasElements.concat(plugin.canvasElements || []);
     });
 
-    var canvas = canvas3.fromXMLDocument(null, canvasElements);
+    var canvas = canvas3.fromXMLDocument(null, canvasElements, {
+        user: sandbox.getConfig().user
+    });
     var canvasWrapper = $(template);
     var shownAlready = false;
     var scrollbarPosition = 0,
@@ -70,7 +72,7 @@ return function(sandbox) {
         },
         setDocument: function(wlxmlDocument) {
             canvas.loadWlxmlDocument(wlxmlDocument);
-            canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());
+            canvasWrapper.find('#rng-module-documentCanvas-contentWrapper').empty().append(canvas.view());
         },
         highlightElement: function(node) {
             canvas.toggleElementHighlight(node, true);
@@ -82,11 +84,11 @@ return function(sandbox) {
             canvas.setCurrentElement(node);
         },
         onAfterActionExecuted: function(action, ret) {
-            if(ret && ret instanceof canvas.wlxmlDocument.CaretFragment && ret.isValid()) {
+            if(ret && ret.isValid()) {
                 logger.debug('The action returned a valid fragment');
-                canvas.setCurrentElement(ret.node, {caretTo: ret.offset});
-                return;
+                return canvas.select(ret);
             }
+
             logger.debug('No valid fragment returned from the action');
 
             (actionHandlers[action.getPluginName()] || []).forEach(function(handler) {