X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/c8ea3d532e8a081a32838b09cfe268a5b2fa7302..f61fd6fa1d5871782b079ee50fb6bb10777cadc2:/modules/documentCanvas/documentCanvas.js?ds=sidebyside diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js index 55c8d7e..9d2e725 100644 --- a/modules/documentCanvas/documentCanvas.js +++ b/modules/documentCanvas/documentCanvas.js @@ -6,7 +6,7 @@ define([ './wlxmlNode', 'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) { - +'use strict'; return function(sandbox) { @@ -32,7 +32,7 @@ return function(sandbox) { this.node.on('click', '[wlxml-tag]', function(e) { e.stopPropagation(); console.log('clicked node type: '+e.target.nodeType); - view._markSelected(new wlxmlNode.Node($(e.target))); + view.selectNode(new wlxmlNode.Node($(e.target))); }); this.node.on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) { @@ -41,7 +41,7 @@ return function(sandbox) { anchor = anchor.parent(); if(!anchor.is('[wlxml-tag]')) return; - view._markSelected(new wlxmlNode.Node(anchor)); + view.selectNode(new wlxmlNode.Node(anchor)); }); this.node.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) { @@ -57,7 +57,7 @@ return function(sandbox) { _.each(mutation.addedNodes, function(node) { node = $(node); node.parent().find('[wlxml-tag]').each(function() { - tag = $(this); + var tag = $(this); if(!tag.attr('id')) tag.attr('id', 'xxxxxxxx-xxxx-xxxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {var r = Math.random()*16|0,v=c=='x'?r:r&0x3|0x8;return v.toString(16);})); }); @@ -162,44 +162,43 @@ return function(sandbox) { getBody: function() { return this.node.find('#rng-module-documentCanvas-content').html(); }, - _markSelected: function(node) { - this.dimNode(node); + selectNode: function(wlxmlNode, options) { + options = options || {}; + var nodeElement = this.getNodeElement(wlxmlNode) + this.dimNode(wlxmlNode); this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode'); + nodeElement.addClass('rng-module-documentCanvas-currentNode'); + + if(options.moveCarret) { + var range = document.createRange(); + range.selectNodeContents(nodeElement[0]); + range.collapse(false); + var selection = document.getSelection(); + selection.removeAllRanges() + selection.addRange(range); + } - this.getNodeElement(node).addClass('rng-module-documentCanvas-currentNode'); - - this.currentNode = node; - sandbox.publish('nodeSelected', node); - - }, - selectNode: function(node) { - view._markSelected(node); - var range = document.createRange(); - range.selectNodeContents(this.getNodeElement(node)[0]); - range.collapse(false); - - var selection = document.getSelection(); - selection.removeAllRanges() - selection.addRange(range); + this.currentNode = wlxmlNode; + sandbox.publish('nodeSelected', wlxmlNode); }, - highlightNode: function(node) { - node = this.getNodeElement(node); + highlightNode: function(wlxmlNode) { + var nodeElement = this.getNodeElement(wlxmlNode); if(!this.gridToggled) { - node.addClass('rng-common-hoveredNode'); - var label = node.attr('wlxml-tag'); - if(node.attr('wlxml-class')) - label += ' / ' + node.attr('wlxml-class'); + nodeElement.addClass('rng-common-hoveredNode'); + var label = nodeElement.attr('wlxml-tag'); + if(nodeElement.attr('wlxml-class')) + label += ' / ' + nodeElement.attr('wlxml-class'); var tag = $('
').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label); - node.append(tag); + nodeElement.append(tag); } }, - dimNode: function(node) { - node = this.getNodeElement(node); + dimNode: function(wlxmlNode) { + var nodeElement = this.getNodeElement(wlxmlNode); if(!this.gridToggled) { - node.removeClass('rng-common-hoveredNode'); - node.find('.rng-module-documentCanvas-hoveredNodeTag').remove(); + nodeElement.removeClass('rng-common-hoveredNode'); + nodeElement.find('.rng-module-documentCanvas-hoveredNodeTag').remove(); } }, selectFirstNode: function() { @@ -233,11 +232,16 @@ return function(sandbox) { var transformed = transformations.fromXML.getDocumentDescription(xml); view.setBody(transformed.HTMLTree); view.selectFirstNode(); - //isDirty = false; + sandbox.publish('documentSet'); + }, + getDocument: function() { + return transformations.toXML.getXML(view.getBody()); }, modifyCurrentNode: function(attr, value) { - if(view.currentNode) - view.currentNode.attr('wlxml-'+attr, value); + if(view.currentNode) { + view.getNodeElement(view.currentNode).attr('wlxml-'+attr, value); + sandbox.publish('contentChanged'); + } }, highlightNode: function(wlxmlNode) { view.highlightNode(wlxmlNode); @@ -246,7 +250,8 @@ return function(sandbox) { view.dimNode(wlxmlNode); }, selectNode: function(wlxmlNode) { - view.selectNode(wlxmlNode); + if(!wlxmlNode.is(view.currentNode)) + view.selectNode(wlxmlNode, {moveCarret: true}); }, toggleGrid: function(toggle) { view.toggleGrid(toggle);