Fix

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 2fa8722..2f8dae5 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -2,64 +2,70 @@
 
 define([
 'libs/underscore-min',
-'./transformations', 
-'./canvas',
-'./canvasManager',
-'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {
+'./canvas/canvas',
+'./commands',
+'libs/text!./template.html'], function(_, canvas3, commands, template) {
 
 'use strict';
 
 return function(sandbox) {
 
-    var canvas = Canvas.create();
-    var manager = new CanvasManager(canvas, sandbox);
+    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 {
         start: function() { sandbox.publish('ready'); },
         getView: function() { 
-            return canvas.dom;
+            return canvasWrapper;
         },
         setDocument: function(xml) {
-            canvas.setHTML(transformations.fromXML.getHTMLTree(xml));
+            canvas.loadWlxml(xml);
+            canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view());
             sandbox.publish('documentSet');
         },
         getDocument: function() {
-            return transformations.toXML.getXML(canvas.getContent());
+            return canvas.toXML();
         },
-        modifyCurrentNode: function(attr, value) {
-            if(manager.currentNode) {
-                if(attr === 'tag') {
-                    manager.getNodeElement(manager.currentNode).attr('wlxml-'+attr, value);
-                }
-                else if(attr === 'class') {
-                    manager.currentNode.setClass(value);
-                } else {
-                    // changing node meta attr
-                    manager.currentNode.setMetaAttr(attr, value);
-                }
-                sandbox.publish('contentChanged');
-                sandbox.publish('currentNodeChanged', manager.currentNode);
+        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);
         },
-        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});
+        highlightElement: function(element) {
+            element.toggleHighlight(true);
         },
-        toggleGrid: function(toggle) {
-            manager.toggleGrid(toggle);
+        dimElement: function(element) {
+            element.toggleHighlight(false);
         },
-        insertNewNode: function(wlxmlTag, wlxmlClass) {
-            manager.insertNewNode(wlxmlTag, wlxmlClass);
+        jumpToElement: function(element) {
+            canvas.setCurrentElement(element);
         },
-        command: function(command, meta) {
-            manager.command(command, meta);
+        command: function(command, params) {
+            commands.run(command, params, canvas);
+            sandbox.publish('contentChanged');
         }
     };