X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/a398f2a96740ebe6dd60559d90e74c648e7009af..4442dc983215c50244bfc43bec26b6d7d9806dbe:/modules/documentCanvas/canvasManager.js?ds=inline diff --git a/modules/documentCanvas/canvasManager.js b/modules/documentCanvas/canvasManager.js index 3b7f72d..dbf414b 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,25 +182,70 @@ 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.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); + +}; + +Manager.prototype.command = function(command, params) { + var selection = window.getSelection(), + element1 = this.canvas.getDocumentElement(selection.anchorNode), + element2 = this.canvas.getDocumentElement(selection.focusNode), + parent1 = element1 ? element1.parent() : undefined, + parent2 = element2 ? element2.parent() : undefined; + + if(command === 'unwrap-node') { + // this.canvas.nodeUnwrap({node: canvasNode.create(pos.parentNode)}); + // this.sandbox.publish('contentChanged'); + if(this.canvas.list.areItemsOfTheSameList({element1: parent1, element2: parent2})) { + this.canvas.list.extractItems({element1: parent1, element2: parent2}); + } else if (!selection.collapsed) { + element1.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(!selection.isCollapsed && element1.parent().sameNode(element2.parent())) { + var parent = element1.parent(), + offsetStart = selection.anchorOffset, + offsetEnd = selection.focusOffset; + + if(element1.sameNode(element2)) { + element1.wrapWithNodeElement({tag: params.wlxmlTag, klass: params.wlxmlClass, start: offsetStart, end: offsetEnd}); + } + else { + if(parent.childIndex(element1) > parent.childIndex(element2)) { + var tmp = offsetStart; + offsetStart = offsetEnd; + offsetEnd = tmp; + } + this.canvas.wrapText({ + inside: parent, + _with: {tag: params.wlxmlTag, klass: params.wlxmlClass}, + offsetStart: offsetStart, + offsetEnd: offsetEnd, + textNodeIdx: [parent.childIndex(element1), parent.childIndex(element2)] + }); + } } } - };