X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/542ac5b2a68670e2c48bb1695a7eb52333ce5d20..2936591f2732b8c8f23c4edffc0f1a7b30d4bcf0:/modules/documentCanvas/documentCanvas.js diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js index 1b919ee..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) { @@ -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,42 +162,43 @@ return function(sandbox) { getBody: function() { return this.node.find('#rng-module-documentCanvas-content').html(); }, - selectNode: function(node, options) { + selectNode: function(wlxmlNode, options) { options = options || {}; - this.dimNode(node); + var nodeElement = this.getNodeElement(wlxmlNode) - this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode'); - this.getNodeElement(node).addClass('rng-module-documentCanvas-currentNode'); - this.currentNode = node; + this.dimNode(wlxmlNode); - if(options.doFocus) { + 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(this.getNodeElement(node)[0]); + range.selectNodeContents(nodeElement[0]); range.collapse(false); - var selection = document.getSelection(); selection.removeAllRanges() selection.addRange(range); } - sandbox.publish('nodeSelected', node); + 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 = $('