fixing test

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

diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js
index 235c97b..4b26135 100644 (file)
--- a/modules/documentCanvas/canvasManager.js
+++ b/modules/documentCanvas/canvasManager.js
@@ -96,47 +96,6 @@ Manager.prototype.selectNode = function(cnode, options) {
     this.sandbox.publish('nodeSelected', cnode);
 };
 
     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.doc().dom().find('#'+cnode.getId());
 };
 Manager.prototype.getNodeElement = function(cnode) {
     return this.canvas.doc().dom().find('#'+cnode.getId());
 };


@@ -189,11 +148,6 @@ Manager.prototype.movecaretToNode = function(nodeElement, where) {
     selection.addRange(range);
 };
 
     selection.addRange(range);
 };
 

-Manager.prototype.toggleGrid =  function(toggle) {
-    this.canvas.doc().dom().find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);
-    this.gridToggled = toggle;
-};
-

 Manager.prototype.onEnterKey = function(e) {
     e.preventDefault();
     var pos = getCursorPosition();
 Manager.prototype.onEnterKey = function(e) {
     e.preventDefault();
     var pos = getCursorPosition();


@@ -228,39 +182,52 @@ Manager.prototype.onBackspaceKey = function(e) {
     }
 };
 
     }
 };
 

-Manager.prototype.toggleList = function(toggle) {
-    var selection  = window.getSelection(),
-        node1 = $(selection.anchorNode).parent()[0],
-        node2 = $(selection.focusNode).parent()[0],
-        element1 = this.canvas.getDocumentElement(node1),
-        element2 = this.canvas.getDocumentElement(node2);
-    if(toggle) {
-        this.canvas.list.create({element1: element1, element2: element2});
-    } else {
-        if(this.canvas.list.areItemsOfTheSameList({element1: element1, element2: element2})) {
-            this.canvas.list.extractItems({element1: element1, element2: element2, merge: false});
-        } 
-    }
-};
+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;

 
 

-Manager.prototype.command = function(command, meta) {
-    var selection  = window.getSelection(),
-        node1 = $(selection.anchorNode).parent()[0],
-        node2 = $(selection.focusNode).parent()[0],
-        element1 = this.canvas.getDocumentElement(node1),
-        element2 = this.canvas.getDocumentElement(node2);

     if(command === 'unwrap-node') {
     if(command === 'unwrap-node') {

-        // this.canvas.nodeUnwrap({node: canvasNode.create(pos.parentNode)});
-        // this.sandbox.publish('contentChanged');
-        if(this.canvas.list.areItemsOfTheSameList({element1: element1, element2: element2})) {
-            this.canvas.list.extractItems({element1: element1, element2: element2});
+        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(command === 'wrap-node') {
         }
     } else if(command === 'wrap-node') {

-        if(this.canvas.list.areItemsOfTheSameList({element1: element1, element2: element2})) {
-            this.canvas.list.create({element1: element1, element2: element2});
+        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)]
+                });
+            }

         }
     }
         }
     }

-

 };
 
 
 };