X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/e573418502325e80c42523264424fa547a435de5..4ac9bc0d440f080281210f023fb9d8c1da42dadd:/modules/documentCanvas/documentCanvas.js

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 6030703..a4dcf37 100644
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -3,106 +3,16 @@
 define([
 'libs/underscore-min',
 './transformations', 
-'./wlxmlNode',
 './canvas',
 './canvasManager',
-'libs/text!./template.html'], function(_, transformations, wlxmlNode, Canvas, CanvasManager, template) {
+'libs/text!./template.html'], function(_, transformations, Canvas, CanvasManager, template) {
 
 'use strict';
 
 return function(sandbox) {
 
-    var canvas = new Canvas.Canvas();
-    
+    var canvas = Canvas.create();
     var manager = new CanvasManager(canvas, sandbox);
-    
-
-    var view = {
-
-        insertNewNode: function(wlxmlTag, wlxmlClass) {
-            //TODO: Insert inline
-            var anchor = $(window.getSelection().anchorNode);
-            var anchorOffset = window.getSelection().anchorOffset;
-            var textLen;
-            if(anchor[0].nodeType === Node.TEXT_NODE) {
-                textLen = anchor.text().length;
-                anchor = anchor.parent();
-            }
-            if(anchor.text() === '') {
-                var todel = anchor;
-                anchor = anchor.parent();
-                todel.remove();
-            }
-            if(anchorOffset > 0 && anchorOffset < textLen) {
-                if(wlxmlTag === null && wlxmlClass === null) {
-                    return this.splitWithNewNode(anchor);
-                }
-                return this.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);
-            }
-            var newNode = this._createNode(wlxmlTag || anchor.attr('wlxml-tag'), wlxmlClass || anchor.attr('wlxml-class'));
-            if(anchorOffset === 0)
-                anchor.before(newNode)
-            else
-                anchor.after(newNode);
-            this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});
-            //isDirty = true;
-            sandbox.publish('contentChanged');
-        },
-        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {
-            var selection = window.getSelection();
-            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {
-                var startOffset = selection.anchorOffset;
-                var endOffset = selection.focusOffset;
-                if(startOffset > endOffset) {
-                    var tmp = startOffset;
-                    startOffset = endOffset;
-                    endOffset = tmp;
-                }
-                var node = selection.anchorNode;
-                var prefix = node.data.substr(0, startOffset);
-                var suffix = node.data.substr(endOffset);
-                var core = node.data.substr(startOffset, endOffset - startOffset);
-                var newNode = this._createNode(wlxmlTag, wlxmlClass);
-                newNode.text(core || 'test');
-                $(node).replaceWith(newNode);
-                newNode.before(prefix);
-                newNode.after(suffix);
-                
-                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});
-                //isDirty = true;
-                sandbox.publish('contentChanged');
-            }
-        },
-        splitWithNewNode: function(node) {
-            var selection = window.getSelection();
-            if(selection.anchorNode === selection.focusNode && selection.anchorNode.nodeType === Node.TEXT_NODE) {
-                var startOffset = selection.anchorOffset;
-                var endOffset = selection.focusOffset;
-                if(startOffset > endOffset) {
-                    var tmp = startOffset;
-                    startOffset = endOffset;
-                    endOffset = tmp;
-                }
-                var anchor = selection.anchorNode;
-                var prefix = anchor.data.substr(0, startOffset);
-                var suffix = anchor.data.substr(endOffset);
-                var prefixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
-                var newNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
-                var suffixNode = this._createNode(node.attr('wlxml-tag'), node.attr('wlxml-class'));
-                prefixNode.text(prefix);
-                suffixNode.text(suffix);
-                node.replaceWith(newNode);
-                newNode.before(prefixNode);
-                newNode.after(suffixNode);
-                
-                this.selectNode(new wlxmlNode.Node(newNode), {movecaret: true});
-                //isDirty = true;
-                sandbox.publish('contentChanged');
-            }
-        }
-
-    };
-    
 
     /* public api */
     return {
@@ -111,7 +21,7 @@ return function(sandbox) {
             return canvas.dom;
         },
         setDocument: function(xml) {
-            canvas.setXML(xml);
+            canvas.setHTML(transformations.fromXML.getHTMLTree(xml));
             sandbox.publish('documentSet');
         },
         getDocument: function() {
@@ -123,15 +33,15 @@ return function(sandbox) {
                 sandbox.publish('contentChanged');
             }
         },
-        highlightNode: function(wlxmlNode) {
-            manager.highlightNode(wlxmlNode);
+        highlightNode: function(canvasNode) {
+            manager.highlightNode(canvasNode);
         },
-        dimNode: function(wlxmlNode) {
-            manager.dimNode(wlxmlNode);
+        dimNode: function(canvasNode) {
+            manager.dimNode(canvasNode);
         },
-        selectNode: function(wlxmlNode) {
-            if(!wlxmlNode.is(manager.currentNode))
-                manager.selectNode(wlxmlNode, {movecaret: true});
+        selectNode: function(canvasNode) {
+            if(!canvasNode.isSame(manager.currentNode))
+                manager.selectNode(canvasNode, {movecaret: true});
         },
         toggleGrid: function(toggle) {
             manager.toggleGrid(toggle);
@@ -139,8 +49,8 @@ return function(sandbox) {
         insertNewNode: function(wlxmlTag, wlxmlClass) {
             manager.insertNewNode(wlxmlTag, wlxmlClass);
         },
-        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {
-            manager.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);
+        command: function(command, meta) {
+            manager.command(command, meta);
         }
     }