X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/599a111c528aa926aafaf5eb46493042efd1a61b..9c680e17e94d8299a55ac811bca76e73339d02f0:/modules/documentCanvas/canvasManager.js

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
index edb599c..4b26135 100644
--- a/modules/documentCanvas/canvasManager.js
+++ b/modules/documentCanvas/canvasManager.js
@@ -28,25 +28,25 @@ var Manager = function(canvas, sandbox) {
     this.currentNode = null;
     var manager = this;
         
-    canvas.dom.find('#rng-module-documentCanvas-content').on('keyup', function() {
+    canvas.doc().dom().find('#rng-module-documentCanvas-content').on('keyup', function() {
         manager.sandbox.publish('contentChanged');
     });
 
-    canvas.dom.on('mouseover', '[wlxml-tag]', function(e) {
+    canvas.doc().dom().on('mouseover', '[wlxml-tag]', function(e) {
         e.stopPropagation();
         manager.sandbox.publish('nodeHovered', canvasNode.create($(e.target)));
     });
-    canvas.dom.on('mouseout', '[wlxml-tag]', function(e) {
+    canvas.doc().dom().on('mouseout', '[wlxml-tag]', function(e) {
         e.stopPropagation();
         manager.sandbox.publish('nodeBlured', canvasNode.create($(e.target)));
     });
-    canvas.dom.on('click', '[wlxml-tag]', function(e) {
+    canvas.doc().dom().on('click', '[wlxml-tag]', function(e) {
         e.stopPropagation();
         console.log('clicked node type: '+e.target.nodeType);
         manager.selectNode(canvasNode.create($(e.target)));
     });
 
-    canvas.dom.on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) {
+    canvas.doc().dom().on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) {
         var anchor = $(window.getSelection().anchorNode);
         
         if(anchor[0].nodeType === Node.TEXT_NODE)
@@ -56,7 +56,7 @@ var Manager = function(canvas, sandbox) {
         manager.selectNode(canvasNode.create(anchor));
     });
     
-    canvas.dom.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {
+    canvas.doc().dom().on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {
         if(e.which === 13) { 
             manager.onEnterKey(e);
         }
@@ -65,17 +65,17 @@ var Manager = function(canvas, sandbox) {
         }
     });
               
-    canvas.dom.onShow = function() {
+    canvas.doc().dom().onShow = function() {
         if(!manager.shownAlready) {
             manager.shownAlready = true;
             manager.selectFirstNode();
         } else if(manager.currentNode) {
             manager.movecaretToNode(manager.getNodeElement(manager.currentNode));
-            canvas.dom.find('#rng-module-documentCanvas-contentWrapper').scrollTop(manager.scrollbarPosition);
+            canvas.doc().dom().find('#rng-module-documentCanvas-contentWrapper').scrollTop(manager.scrollbarPosition);
         }
     };
-    canvas.dom.onHide = function() {
-       manager.scrollbarPosition = canvas.dom.find('#rng-module-documentCanvas-contentWrapper').scrollTop();
+    canvas.doc().dom().onHide = function() {
+       manager.scrollbarPosition = canvas.doc().dom().find('#rng-module-documentCanvas-contentWrapper').scrollTop();
     };
 };
     
@@ -85,7 +85,7 @@ Manager.prototype.selectNode = function(cnode, options) {
     
     this.dimNode(cnode);
     
-    this.canvas.dom.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');
+    this.canvas.doc().dom().find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');
     nodeElement.addClass('rng-module-documentCanvas-currentNode');
     
     if(options.movecaret) {
@@ -96,49 +96,8 @@ Manager.prototype.selectNode = function(cnode, options) {
     this.sandbox.publish('nodeSelected', cnode);
 };
 
-Manager.prototype.insertNewNode = function(wlxmlTag, wlxmlClass) {
-    var selection = window.getSelection(),
-        $anchorNode = $(selection.anchorNode),
-        $focusNode = $(selection.focusNode);
-        
-        
-    if(!selection.isCollapsed && $anchorNode.parent()[0] === $focusNode.parent()[0]) {
-        var textNodeIdx,
-            parent = $anchorNode.parent(),
-            parentContents = parent.contents(),
-            offsetStart = selection.anchorOffset,
-            offsetEnd = selection.focusOffset;
-        
-        if(selection.anchorNode === selection.focusNode) {
-            if(offsetStart > offsetEnd) {
-                var tmp = offsetStart;
-                offsetStart = offsetEnd;
-                offsetEnd = tmp;
-            }
-            textNodeIdx = parentContents.index($anchorNode);
-        } else {
-            if(parentContents.index($anchorNode) > parentContents.index($focusNode)) {
-                offsetStart = selection.focusOffset;
-                offsetEnd = selection.anchorOffset;
-            }
-            textNodeIdx = [parentContents.index($anchorNode), parentContents.index($focusNode)];
-        }
-        
-        var wrapper = canvasNode.create({tag: wlxmlTag, klass: wlxmlClass});
-        this.canvas.nodeWrap({inside: canvasNode.create(parent),
-                              _with: wrapper,
-                              offsetStart: offsetStart,
-                              offsetEnd: offsetEnd,
-                              textNodeIdx: textNodeIdx
-                            });
-        this.selectNode(wrapper, {movecaret: 'end'});
-    }
-    
-    
-};
-
 Manager.prototype.getNodeElement = function(cnode) {
-    return this.canvas.dom.find('#'+cnode.getId());
+    return this.canvas.doc().dom().find('#'+cnode.getId());
 };
 
 Manager.prototype.highlightNode = function(cnode) {
@@ -162,14 +121,14 @@ Manager.prototype.dimNode = function(cnode) {
 };
 
 Manager.prototype.selectFirstNode = function() {
-    var firstNodeWithText = this.canvas.dom.find('[wlxml-tag]').filter(function() {
+    var firstNodeWithText = this.canvas.doc().dom().find('[wlxml-tag]').filter(function() {
         return $(this).clone().children().remove().end().text().trim() !== '';
     }).first();
     var node;
     if(firstNodeWithText.length)
         node = $(firstNodeWithText[0]);
     else {
-        node = this.canvas.dom.find('[wlxml-class|="p"]');
+        node = this.canvas.doc().dom().find('[wlxml-class|="p"]');
     }
     this.selectNode(canvasNode.create(node), {movecaret: true});
 };
@@ -189,11 +148,6 @@ Manager.prototype.movecaretToNode = function(nodeElement, where) {
     selection.addRange(range);
 };
 
-Manager.prototype.toggleGrid =  function(toggle) {
-    this.canvas.dom.find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);
-    this.gridToggled = toggle;
-};
-
 Manager.prototype.onEnterKey = function(e) {
     e.preventDefault();
     var pos = getCursorPosition();
@@ -228,28 +182,52 @@ Manager.prototype.onBackspaceKey = function(e) {
     }
 };
 
-Manager.prototype.command = function(command, meta) {
-    var pos = getCursorPosition();
-    
-    if(command === 'createList') {
-        var node = canvasNode.create(pos.parentNode);
-        if(window.getSelection().getRangeAt(0).collapsed && this.canvas.nodeInsideList({node: node})) {
-            this.canvas.listRemove({pointer: node});
-            this.selectNode(node, {movecaret: 'end'});
-            this.sandbox.publish('contentChanged');
+Manager.prototype.command = function(command, params) {
+
+    var cursor = this.canvas.getCursor(),
+        selectionStart = cursor.getSelectionStart(),
+        selectionEnd = cursor.getSelectionEnd(),
+        parent1 = selectionStart.element.parent() || undefined,
+        parent2 = selectionEnd.element.parent() || undefined;
+
+    if(command === 'unwrap-node') {
+        if(this.canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
+            this.canvas.list.extractItems({element1: parent1, element2: parent2});
+        } else if(!cursor.isSelecting()) {
+            cursor.getPosition().element.unwrap();
         }
-        else {
-            //if(!this.canvas.nodeInsideList({node: node})) {
-                this.canvas.listCreate({start: node, end: canvasNode.create(pos.focusNode), type: meta});
-                this.selectNode(node, {movecaret: 'end'});
-                this.sandbox.publish('contentChanged');
-            //}
+    } else if(command === 'wrap-node') {
+        if(this.canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
+            this.canvas.list.create({element1: parent1, element2: parent2});
+        }
+    } else if(command === 'toggle-list') {
+        if(params.toggle) {
+            this.canvas.list.create({element1: parent1, element2: parent2});
+        } else {
+            if(this.canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) {
+                this.canvas.list.extractItems({element1: parent1, element2: parent2, merge: false});
+            } 
+        }
+    } else if(command == 'toggle-grid') {
+        this.canvas.doc().dom().find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', params.toggle);
+        this.gridToggled = params.toggle;
+    } else if(command == 'newNodeRequested') {
+        if(cursor.isSelecting() && cursor.isSelectingSiblings()) {
+            if(cursor.isSelectingWithinElement()) {
+                selectionStart.element.wrapWithNodeElement({tag: params.wlxmlTag, klass: params.wlxmlClass, start: selectionStart.offset, end: selectionEnd.offset});
+            }
+            else {
+                var parent = selectionStart.element.parent();
+                this.canvas.wrapText({
+                    inside: parent,
+                    _with: {tag: params.wlxmlTag, klass: params.wlxmlClass},
+                    offsetStart: selectionStart.offset,
+                    offsetEnd: selectionEnd.offset,
+                    textNodeIdx: [parent.childIndex(selectionStart.element), parent.childIndex(selectionEnd.element)]
+                });
+            }
         }
-    } else if(command === 'unwrap-node') {
-        this.canvas.nodeUnwrap({node: canvasNode.create(pos.parentNode)});
-        this.sandbox.publish('contentChanged');
     }
-
 };