Setting caret after moving list elements up one level

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 37e8377..73917f7 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -1,59 +1,78 @@
-// Module that implements main WYSIWIG edit area\r
-\r
-define([\r
-'libs/underscore-min',\r
-'./transformations', \r
-'./canvas',\r
-'./canvasManager',\r
-'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {\r
-\r
-'use strict';\r
-\r
-return function(sandbox) {\r
-\r
-    var canvas = Canvas.create();\r
-    var manager = new CanvasManager(canvas, sandbox);\r
-\r
-    /* public api */\r
-    return {\r
-        start: function() { sandbox.publish('ready'); },\r
-        getView: function() { \r
-            return canvas.dom;\r
-        },\r
-        setDocument: function(xml) {\r
-            canvas.setHTML(transformations.fromXML.getHTMLTree(xml));\r
-            sandbox.publish('documentSet');\r
-        },\r
-        getDocument: function() {\r
-            return transformations.toXML.getXML(canvas.getContent());\r
-        },\r
-        modifyCurrentNode: function(attr, value) {\r
-            if(manager.currentNode) {\r
-                manager.getNodeElement(manager.currentNode).attr('wlxml-'+attr, value);\r
-                sandbox.publish('contentChanged');\r
-            }\r
-        },\r
-        highlightNode: function(canvasNode) {\r
-            manager.highlightNode(canvasNode);\r
-        },\r
-        dimNode: function(canvasNode) {\r
-            manager.dimNode(canvasNode);\r
-        },\r
-        selectNode: function(canvasNode) {\r
-            if(!canvasNode.isSame(manager.currentNode))\r
-                manager.selectNode(canvasNode, {movecaret: true});\r
-        },\r
-        toggleGrid: function(toggle) {\r
-            manager.toggleGrid(toggle);\r
-        },\r
-        insertNewNode: function(wlxmlTag, wlxmlClass) {\r
-            manager.insertNewNode(wlxmlTag, wlxmlClass);\r
-        },\r
-        command: function(command, meta) {\r
-            manager.command(command, meta);\r
-        }\r
-    };\r
-    \r
-};\r
-\r
+// 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