X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/0b89e99ee683a4104d07b0756e090becaa52ad9c..42137454f5546e6346ff24374cba0394174321d2:/modules/documentCanvas/documentCanvas.js?ds=sidebyside

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 4ca0a4d..73917f7 100644
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -1,59 +1,78 @@
-// Module that implements main WYSIWIG edit area
-
-define([
-'libs/underscore-min',
-'./transformations', 
-'./canvas',
-'./canvasManager',
-'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {
-
-'use strict';
-
-return function(sandbox) {
-
-    var canvas = Canvas.create();
-    var manager = new CanvasManager(canvas, sandbox);
-
-    /* public api */
-    return {
-        start: function() { sandbox.publish('ready'); },
-        getView: function() { 
-            return canvas.dom;
-        },
-        setDocument: function(xml) {
-            canvas.setHTML(transformations.fromXML.getHTMLTree(xml));
-            sandbox.publish('documentSet');
-        },
-        getDocument: function() {
-            return transformations.toXML.getXML(canvas.getContent())
-        },
-        modifyCurrentNode: function(attr, value) {
-            if(manager.currentNode) {
-                manager.getNodeElement(manager.currentNode).attr('wlxml-'+attr, value);
-                sandbox.publish('contentChanged');
-            }
-        },
-        highlightNode: function(canvasNode) {
-            manager.highlightNode(canvasNode);
-        },
-        dimNode: function(canvasNode) {
-            manager.dimNode(canvasNode);
-        },
-        selectNode: function(canvasNode) {
-            if(!canvasNode.isSame(manager.currentNode))
-                manager.selectNode(canvasNode, {movecaret: true});
-        },
-        toggleGrid: function(toggle) {
-            manager.toggleGrid(toggle);
-        },
-        insertNewNode: function(wlxmlTag, wlxmlClass) {
-            manager.insertNewNode(wlxmlTag, wlxmlClass);
-        },
-        command: function(command, meta) {
-            manager.command(command, meta);
-        }
-    }
-    
-};
-
+// Module that implements main WYSIWIG edit area
+
+define([
+'libs/underscore-min',
+'./transformations', 
+'./canvas',
+'./canvasManager',
+'./canvas/canvas',
+'./commands',
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, commands, template) {
+
+'use strict';
+
+return function(sandbox) {
+
+    var canvas = canvas3.fromXML('', sandbox.publish); //canvasCanvas.create();
+    var manager;
+    var canvasWrapper = $(template);
+    var shownAlready = false;
+    var scrollbarPosition = 0,
+        cursorPosition;
+    
+    canvasWrapper.onShow = function() {
+        if(!shownAlready) {
+            shownAlready = true;
+            canvas.setCurrentElement(canvas.doc().getVerticallyFirstTextElement());
+        } else {
+            canvas.setCursorPosition(cursorPosition);
+            this.find('#rng-module-documentCanvas-contentWrapper').scrollTop(scrollbarPosition);
+        }
+    };
+    
+    canvasWrapper.onHide = function() {
+       scrollbarPosition = this.find('#rng-module-documentCanvas-contentWrapper').scrollTop();
+       cursorPosition = canvas.getCursor().getPosition();
+    };
+
+    /* public api */
+    return {
+        start: function() { sandbox.publish('ready'); },
+        getView: function() { 
+            return canvasWrapper;
+        },
+        setDocument: function(xml) {
+            canvas.loadWlxml(xml); //canvas.setHTML(transformations.fromXML.getHTMLTree(xml));
+            canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());
+            manager = new CanvasManager(canvas, sandbox);
+            sandbox.publish('documentSet');
+        },
+        getDocument: function() {
+            return transformations.toXML.getXML(canvas.getContent());
+        },
+        modifyCurrentNodeElement: function(attr, value) {
+            var currentNodeElement = canvas.getCurrentNodeElement();
+            if(attr === 'class' || attr === 'tag') {
+                currentNodeElement['setWlxml'+(attr[0].toUpperCase() + attr.substring(1))](value);
+            } else {
+                currentNodeElement.setWlxmlMetaAttr(attr, value);
+            }
+            sandbox.publish('currentNodeElementChanged', currentNodeElement);
+        },
+        highlightElement: function(element) {
+            canvas.highlightElement(element);
+        },
+        dimElement: function(element) {
+            canvas.dimElement(element);
+        },
+        jumpToElement: function(element) {
+            canvas.setCurrentElement(element);
+        },
+        command: function(command, params) {
+            commands.run(command, params, canvas);
+        }
+    };
+    
+};
+
 });
\ No newline at end of file