integration wip: nodePane, familyTree, breadcrumbs

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 2fa8722..9488aed 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -5,61 +5,48 @@ define([
 './transformations', 
 './canvas',
 './canvasManager',
-'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {
+'./canvas/canvas',
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, canvas3, template) {
 
 'use strict';
 
 return function(sandbox) {
 
-    var canvas = Canvas.create();
-    var manager = new CanvasManager(canvas, sandbox);
+    var canvas = canvas3.fromXML('', sandbox.publish); //canvasCanvas.create();
+    var manager;
+    var canvasWrapper = $(template);
 
     /* 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); //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());
         },
-        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) {
+            if(attr === 'class' || attr === 'tag') {
+                canvas.getCurrentNodeElement()['setWlxml'+(attr[0].toUpperCase() + attr.substring(1))](value);    
             }
         },
-        highlightNode: function(canvasNode) {
-            manager.highlightNode(canvasNode);
+        highlightElement: function(element) {
+            canvas.highlightElement(element);
         },
-        dimNode: function(canvasNode) {
-            manager.dimNode(canvasNode);
+        dimElement: function(element) {
+            canvas.dimElement(element);
         },
-        selectNode: function(canvasNode) {
-            if(!canvasNode.isSame(manager.currentNode))
-                manager.selectNode(canvasNode, {movecaret: true});
+        jumpToElement: function(element) {
+            canvas.setCurrentElement(element);
         },
-        toggleGrid: function(toggle) {
-            manager.toggleGrid(toggle);
-        },
-        insertNewNode: function(wlxmlTag, wlxmlClass) {
-            manager.insertNewNode(wlxmlTag, wlxmlClass);
-        },
-        command: function(command, meta) {
-            manager.command(command, meta);
+        command: function(command, params) {
+            manager.command(command, params);
         }
     };