Refactoring

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index e666f0d..05fbcdd 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -32,7 +32,7 @@ return function(sandbox) {
             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
@@ -41,7 +41,7 @@ return function(sandbox) {
                     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
@@ -162,44 +162,43 @@ return function(sandbox) {
         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-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');\r
+            this.dimNode(wlxmlNode);\r
             \r
-            node.addClass('rng-module-documentCanvas-currentNode');\r
-\r
-            this.currentNode = node;\r
-            sandbox.publish('nodeSelected', new wlxmlNode.Node(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
-            node = this.getNodeElement(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
-        highlightNode: function(node) {\r
-            node = this.getNodeElement(node);\r
+        highlightNode: function(wlxmlNode) {\r
+            var nodeElement = this.getNodeElement(wlxmlNode);\r
             if(!this.gridToggled) {\r
-                node.addClass('rng-common-hoveredNode');\r
-                var label = node.attr('wlxml-tag');\r
-                if(node.attr('wlxml-class'))\r
-                    label += ' / ' + node.attr('wlxml-class');\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
-                node.append(tag);\r
+                nodeElement.append(tag);\r
             }\r
         },\r
-        dimNode: function(node) {\r
-            node = this.getNodeElement(node);\r
+        dimNode: function(wlxmlNode) {\r
+            var nodeElement = this.getNodeElement(wlxmlNode);\r
             if(!this.gridToggled) {\r
-                node.removeClass('rng-common-hoveredNode');\r
-                node.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r
+                nodeElement.removeClass('rng-common-hoveredNode');\r
+                nodeElement.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r
             }\r
         },\r
         selectFirstNode: function() {\r
@@ -246,7 +245,7 @@ return function(sandbox) {
             view.dimNode(wlxmlNode);\r
         },\r
         selectNode: function(wlxmlNode) {\r
-            view.selectNode(wlxmlNode);\r
+            view.selectNode(wlxmlNode, {moveCarret: true});\r
         },\r
         toggleGrid: function(toggle) {\r
             view.toggleGrid(toggle);\r