Fixing list removal

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 6030703..a4dcf37 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -3,106 +3,16 @@
 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
-    \r
+    var canvas = Canvas.create();\r
     var manager = new CanvasManager(canvas, sandbox);\r
-    \r
-\r
-    var view = {\r
-\r
-        insertNewNode: function(wlxmlTag, wlxmlClass) {\r
-            //TODO: Insert inline\r
-            var anchor = $(window.getSelection().anchorNode);\r
-            var anchorOffset = window.getSelection().anchorOffset;\r
-            var textLen;\r
-            if(anchor[0].nodeType === Node.TEXT_NODE) {\r
-                textLen = anchor.text().length;\r
-                anchor = anchor.parent();\r
-            }\r
-            if(anchor.text() === '') {\r
-                var todel = anchor;\r
-                anchor = anchor.parent();\r
-                todel.remove();\r
-            }\r
-            if(anchorOffset > 0 && anchorOffset < textLen) {\r
-                if(wlxmlTag === null && wlxmlClass === null) {\r
-                    return this.splitWithNewNode(anchor);\r
-                }\r
-                return this.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
-            }\r
-            var newNode = this._createNode(wlxmlTag || anchor.attr('wlxml-tag'), wlxmlClass || anchor.attr('wlxml-class'));\r
-            if(anchorOffset === 0)\r
-                anchor.before(newNode)\r
-            else\r
-                anchor.after(newNode);\r
-            this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});\r
-            //isDirty = true;\r
-            sandbox.publish('contentChanged');\r
-        },\r
-        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
-            var selection = window.getSelection();\r
-            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
-                var startOffset = selection.anchorOffset;\r
-                var endOffset = selection.focusOffset;\r
-                if(startOffset > endOffset) {\r
-                    var tmp = startOffset;\r
-                    startOffset = endOffset;\r
-                    endOffset = tmp;\r
-                }\r
-                var node = selection.anchorNode;\r
-                var prefix = node.data.substr(0, startOffset);\r
-                var suffix = node.data.substr(endOffset);\r
-                var core = node.data.substr(startOffset, endOffset - startOffset);\r
-                var newNode = this._createNode(wlxmlTag, wlxmlClass);\r
-                newNode.text(core || 'test');\r
-                $(node).replaceWith(newNode);\r
-                newNode.before(prefix);\r
-                newNode.after(suffix);\r
-                \r
-                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});\r
-                //isDirty = true;\r
-                sandbox.publish('contentChanged');\r
-            }\r
-        },\r
-        splitWithNewNode: function(node) {\r
-            var selection = window.getSelection();\r
-            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {\r
-                var startOffset = selection.anchorOffset;\r
-                var endOffset = selection.focusOffset;\r
-                if(startOffset > endOffset) {\r
-                    var tmp = startOffset;\r
-                    startOffset = endOffset;\r
-                    endOffset = tmp;\r
-                }\r
-                var anchor = selection.anchorNode;\r
-                var prefix = anchor.data.substr(0, startOffset);\r
-                var suffix = anchor.data.substr(endOffset);\r
-                var prefixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
-                var newNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
-                var suffixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));\r
-                prefixNode.text(prefix);\r
-                suffixNode.text(suffix);\r
-                node.replaceWith(newNode);\r
-                newNode.before(prefixNode);\r
-                newNode.after(suffixNode);\r
-                \r
-                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});\r
-                //isDirty = true;\r
-                sandbox.publish('contentChanged');\r
-            }\r
-        }\r
-\r
-    };\r
-    \r
 \r
     /* public api */\r
     return {\r
@@ -111,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
@@ -123,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
@@ -139,8 +49,8 @@ return function(sandbox) {
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
             manager.insertNewNode(wlxmlTag, wlxmlClass);\r
         },\r
-        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
-            manager.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
+        command: function(command, meta) {\r
+            manager.command(command, meta);\r
         }\r
     }\r
     \r