fixing wrapping DocumentElements

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index fb67c0d..7500e35 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -1,60 +1,72 @@
-// Module that implements main WYSIWIG edit area\r
-\r
-define([\r
-'libs/underscore-min',\r
-'./transformations', \r
-'./wlxmlNode',\r
-'./canvas',\r
-'./canvasManager',\r
-'libs/text!./template.html'], function(_, transformations, wlxmlNode, Canvas, CanvasManager, template) {\r
-\r
-'use strict';\r
-\r
-return function(sandbox) {\r
-\r
-    var canvas = new Canvas.Canvas();\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.setXML(xml);\r
-            sandbox.publish('documentSet');\r
-        },\r
-        getDocument: function() {\r
-            return canvas.toXML();\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(wlxmlNode) {\r
-            manager.highlightNode(wlxmlNode);\r
-        },\r
-        dimNode: function(wlxmlNode) {\r
-            manager.dimNode(wlxmlNode);\r
-        },\r
-        selectNode: function(wlxmlNode) {\r
-            if(!wlxmlNode.is(manager.currentNode))\r
-                manager.selectNode(wlxmlNode, {movecaret: true});\r
-        },\r
-        toggleGrid: function(toggle) {\r
-            manager.toggleGrid(toggle);\r
-        },\r
-        insertNewNode: function(wlxmlTag, wlxmlClass) {\r
-            manager.insertNewNode(wlxmlTag, wlxmlClass);\r
-        },\r
-        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
-            manager.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
-        }\r
-    }\r
-    \r
-};\r
-\r
+// Module that implements main WYSIWIG edit area
+
+define([
+'libs/underscore-min',
+'./transformations', 
+'./canvas',
+'./canvasManager',
+'./canvas/canvas',
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, template) {
+
+'use strict';
+
+return function(sandbox) {
+
+    var canvas = canvas3.fromXML(''); //canvasCanvas.create();
+    var manager;
+    var canvasWrapper = $(template);
+
+    /* 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.doc().dom());
+            manager = new CanvasManager(canvas, sandbox);
+            sandbox.publish('documentSet');
+        },
+        getDocument: function() {
+            return transformations.toXML.getXML(canvas.getContent());
+        },
+        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);
+            }
+        },
+        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);
+        }
+    };
+    
+};
+

 });
\ No newline at end of file
 });
\ No newline at end of file