X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/ce24094b892d3fb0faf000b5e2bf64f58ce4aae5..e7de024e8c0798383a31b7c8bb08dc31a5ce876a:/modules/documentCanvas/documentCanvas.js?ds=sidebyside

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 9488aed..decda83 100644
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -2,19 +2,34 @@
 
 define([
 'libs/underscore-min',
-'./transformations', 
-'./canvas',
-'./canvasManager',
 './canvas/canvas',
-'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, template) {
+'./commands',
+'libs/text!./template.html'], function(_, canvas3, commands, template) {
 
 'use strict';
 
 return function(sandbox) {
 
-    var canvas = canvas3.fromXML('', sandbox.publish); //canvasCanvas.create();
-    var manager;
+    var canvas = canvas3.fromXML('', sandbox.publish);
     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 {
@@ -23,18 +38,21 @@ return function(sandbox) {
             return canvasWrapper;
         },
         setDocument: function(xml) {
-            canvas.loadWlxml(xml); //canvas.setHTML(transformations.fromXML.getHTMLTree(xml));
+            canvas.loadWlxml(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());
+            return canvas.toXML();
         },
         modifyCurrentNodeElement: function(attr, value) {
+            var currentNodeElement = canvas.getCurrentNodeElement();
             if(attr === 'class' || attr === 'tag') {
-                canvas.getCurrentNodeElement()['setWlxml'+(attr[0].toUpperCase() + attr.substring(1))](value);    
+                currentNodeElement['setWlxml'+(attr[0].toUpperCase() + attr.substring(1))](value);
+            } else {
+                currentNodeElement.setWlxmlMetaAttr(attr, value);
             }
+            sandbox.publish('currentNodeElementChanged', currentNodeElement);
         },
         highlightElement: function(element) {
             canvas.highlightElement(element);
@@ -46,7 +64,8 @@ return function(sandbox) {
             canvas.setCurrentElement(element);
         },
         command: function(command, params) {
-            manager.command(command, params);
+            commands.run(command, params, canvas);
+            sandbox.publish('contentChanged');
         }
     };