define([\r
'libs/underscore-min',\r
'./transformations', \r
-'libs/text!./template.html'], function(_, transformations, template) {\r
+'./wlxmlNode',\r
+'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) {\r
\r
\r
\r
sandbox.publish('contentChanged');\r
});\r
\r
- this.node.on('mouseover', '[wlxml-tag]', function(e) { sandbox.publish('nodeHovered', $(e.target)); });\r
- this.node.on('mouseout', '[wlxml-tag]', function(e) { sandbox.publish('nodeBlured', $(e.target)); });\r
+ this.node.on('mouseover', '[wlxml-tag]', function(e) {\r
+ e.stopPropagation();\r
+ sandbox.publish('nodeHovered', new wlxmlNode.Node($(e.target)));\r
+ });\r
+ this.node.on('mouseout', '[wlxml-tag]', function(e) {\r
+ e.stopPropagation();\r
+ sandbox.publish('nodeBlured', new wlxmlNode.Node($(e.target)));\r
+ });\r
this.node.on('click', '[wlxml-tag]', function(e) {\r
+ e.stopPropagation();\r
console.log('clicked node type: '+e.target.nodeType);\r
- view._markSelected($(e.target));\r
+ view.selectNode(new wlxmlNode.Node($(e.target)));\r
});\r
\r
this.node.on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) {\r
anchor = anchor.parent();\r
if(!anchor.is('[wlxml-tag]'))\r
return;\r
- view._markSelected(anchor);\r
+ view.selectNode(new wlxmlNode.Node(anchor));\r
});\r
\r
this.node.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {\r
anchor.before(newNode)\r
else\r
anchor.after(newNode);\r
- mediator.nodeCreated(newNode);\r
+ this.selectNode(newNode);\r
//isDirty = true;\r
sandbox.publish('contentChanged');\r
},\r
$(node).replaceWith(newNode);\r
newNode.before(prefix);\r
newNode.after(suffix);\r
- mediator.nodeCreated(newNode);\r
+ \r
+ this.selectNode(newNode);\r
//isDirty = true;\r
sandbox.publish('contentChanged');\r
}\r
node.replaceWith(newNode);\r
newNode.before(prefixNode);\r
newNode.after(suffixNode);\r
- mediator.nodeCreated(newNode);\r
+ \r
+ this.selectNode(newNode);\r
//isDirty = true;\r
sandbox.publish('contentChanged');\r
}\r
getBody: function() {\r
return this.node.find('#rng-module-documentCanvas-content').html();\r
}, \r
- _markSelected: function(node) {\r
- this.dimNode(node);\r
+ selectNode: function(wlxmlNode, options) {\r
+ options = options || {};\r
+ var nodeElement = this.getNodeElement(wlxmlNode)\r
\r
- this.node.find('.rng-current').removeClass('rng-current');\r
+ this.dimNode(wlxmlNode);\r
\r
- node.addClass('rng-current');\r
-\r
- this.currentNode = node;\r
- sandbox.publish('nodeSelected', node);\r
+ this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');\r
+ nodeElement.addClass('rng-module-documentCanvas-currentNode');\r
+ \r
+ if(options.moveCarret) {\r
+ var range = document.createRange();\r
+ range.selectNodeContents(nodeElement[0]);\r
+ range.collapse(false);\r
+ var selection = document.getSelection();\r
+ selection.removeAllRanges()\r
+ selection.addRange(range);\r
+ }\r
\r
+ this.currentNode = wlxmlNode;\r
+ sandbox.publish('nodeSelected', wlxmlNode);\r
},\r
- selectNode: function(node) {\r
- view._markSelected(node);\r
- var range = document.createRange();\r
- range.selectNodeContents(node[0]);\r
- range.collapse(false);\r
-\r
- var selection = document.getSelection();\r
- selection.removeAllRanges()\r
- selection.addRange(range);\r
- },\r
- selectNodeById: function(id) {\r
- var node = this.node.find('#'+id);\r
- if(node)\r
- this.selectNode(node);\r
- },\r
- highlightNode: function(node) {\r
+ highlightNode: function(wlxmlNode) {\r
+ var nodeElement = this.getNodeElement(wlxmlNode);\r
if(!this.gridToggled) {\r
- node.addClass('rng-hover');\r
- var label = node.attr('wlxml-tag');\r
- if(node.attr('wlxml-class'))\r
- label += ' / ' + node.attr('wlxml-class');\r
- var tag = $('<div>').addClass('rng-visualEditor-nodeHoverTag').text(label);\r
- node.append(tag);\r
+ nodeElement.addClass('rng-common-hoveredNode');\r
+ var label = nodeElement.attr('wlxml-tag');\r
+ if(nodeElement.attr('wlxml-class'))\r
+ label += ' / ' + nodeElement.attr('wlxml-class');\r
+ var tag = $('<div>').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label);\r
+ nodeElement.append(tag);\r
}\r
},\r
- dimNode: function(node) {\r
+ dimNode: function(wlxmlNode) {\r
+ var nodeElement = this.getNodeElement(wlxmlNode);\r
if(!this.gridToggled) {\r
- node.removeClass('rng-hover');\r
- node.find('.rng-visualEditor-nodeHoverTag').remove();\r
+ nodeElement.removeClass('rng-common-hoveredNode');\r
+ nodeElement.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r
}\r
},\r
- highlightNodeById: function(id) {\r
- var node = this.node.find('#'+id);\r
- if(node)\r
- this.highlightNode(node);\r
- },\r
- dimNodeById: function(id) {\r
- var node = this.node.find('#'+id);\r
- if(node)\r
- this.dimNode(node);\r
- },\r
selectFirstNode: function() {\r
var firstNodeWithText = this.node.find('[wlxml-tag]').filter(function() {\r
return $(this).clone().children().remove().end().text().trim() !== '';\r
else {\r
node = this.node.find('[wlxml-class|="p"]')\r
}\r
- this.selectNode(node);\r
+ this.selectNode(new wlxmlNode.Node(node));\r
},\r
toggleGrid: function(toggle) {\r
- this.node.find('[wlxml-tag]').toggleClass('rng-hover', toggle);\r
+ this.node.find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);\r
this.gridToggled = toggle;\r
+ },\r
+ getNodeElement: function(wlxmlNode) {\r
+ return this.node.find('#'+wlxmlNode.id);\r
}\r
};\r
\r
if(view.currentNode)\r
view.currentNode.attr('wlxml-'+attr, value);\r
},\r
- highlightNode: function(id) {\r
- view.highlightNodeById(id);\r
+ highlightNode: function(wlxmlNode) {\r
+ view.highlightNode(wlxmlNode);\r
+ },\r
+ dimNode: function(wlxmlNode) {\r
+ view.dimNode(wlxmlNode);\r
+ },\r
+ selectNode: function(wlxmlNode) {\r
+ view.selectNode(wlxmlNode, {moveCarret: true});\r
},\r
- dimNode: function(id) {\r
- view.dimNodeById(id);\r
+ toggleGrid: function(toggle) {\r
+ view.toggleGrid(toggle);\r
+ },\r
+ insertNewNode: function(wlxmlTag, wlxmlClass) {\r
+ view.insertNewNode(wlxmlTag, wlxmlClass);\r
},\r
- selectNode: function(id) {\r
- view.selectNodeById(id);\r
+ wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {\r
+ view.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);\r
}\r
- \r
}\r
\r
};\r
fnp / fnpeditor.git / blobdiff