Another set of missing semicolons

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index cc4964b..37e8377 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -3,16 +3,15 @@
 define([\r
 'libs/underscore-min',\r
 './transformations', \r
 define([\r
 'libs/underscore-min',\r
 './transformations', \r

-'./wlxmlNode',\r

 './canvas',\r
 './canvasManager',\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
 \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
     var manager = new CanvasManager(canvas, sandbox);\r
 \r
     /* public api */\r


@@ -22,11 +21,11 @@ return function(sandbox) {
             return canvas.dom;\r
         },\r
         setDocument: function(xml) {\r
             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
             sandbox.publish('documentSet');\r
         },\r
         getDocument: function() {\r

-            return canvas.toXML();\r
+            return transformations.toXML.getXML(canvas.getContent());\r

         },\r
         modifyCurrentNode: function(attr, value) {\r
             if(manager.currentNode) {\r
         },\r
         modifyCurrentNode: function(attr, value) {\r
             if(manager.currentNode) {\r


@@ -34,15 +33,15 @@ return function(sandbox) {
                 sandbox.publish('contentChanged');\r
             }\r
         },\r
                 sandbox.publish('contentChanged');\r
             }\r
         },\r

-        highlightNode: function(wlxmlNode) {\r
-            manager.highlightNode(wlxmlNode);\r
+        highlightNode: function(canvasNode) {\r
+            manager.highlightNode(canvasNode);\r

         },\r
         },\r

-        dimNode: function(wlxmlNode) {\r
-            manager.dimNode(wlxmlNode);\r
+        dimNode: function(canvasNode) {\r
+            manager.dimNode(canvasNode);\r

         },\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
         },\r
         toggleGrid: function(toggle) {\r
             manager.toggleGrid(toggle);\r


@@ -50,13 +49,10 @@ return function(sandbox) {
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
             manager.insertNewNode(wlxmlTag, wlxmlClass);\r
         },\r
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
             manager.insertNewNode(wlxmlTag, wlxmlClass);\r
         },\r

-        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
-            manager.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
-        },\r

         command: function(command, meta) {\r
             manager.command(command, meta);\r
         }\r
         command: function(command, meta) {\r
             manager.command(command, meta);\r
         }\r

-    }\r
+    };\r

     \r
 };\r
 \r
     \r
 };\r
 \r