Introducing two types of lists: bullet & enum

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index bec74fc..a4dcf37 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -3,16 +3,15 @@
 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
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {\r
 \r
 'use strict';\r
 \r
 return function(sandbox) {\r
 \r
-    var canvas = new Canvas.Canvas();\r
+    var canvas = Canvas.create();\r
     var manager = new CanvasManager(canvas, sandbox);\r
 \r
     /* public api */\r
@@ -22,7 +21,7 @@ return function(sandbox) {
             return canvas.dom;\r
         },\r
         setDocument: function(xml) {\r
-            canvas.setXML(xml);\r
+            canvas.setHTML(transformations.fromXML.getHTMLTree(xml));\r
             sandbox.publish('documentSet');\r
         },\r
         getDocument: function() {\r
@@ -34,15 +33,15 @@ return function(sandbox) {
                 sandbox.publish('contentChanged');\r
             }\r
         },\r
-        highlightNode: function(wlxmlNode) {\r
-            manager.highlightNode(wlxmlNode);\r
+        highlightNode: function(canvasNode) {\r
+            manager.highlightNode(canvasNode);\r
         },\r
-        dimNode: function(wlxmlNode) {\r
-            manager.dimNode(wlxmlNode);\r
+        dimNode: function(canvasNode) {\r
+            manager.dimNode(canvasNode);\r
         },\r
-        selectNode: function(wlxmlNode) {\r
-            if(!wlxmlNode.is(manager.currentNode))\r
-                manager.selectNode(wlxmlNode, {movecaret: true});\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