Fixing event handling in documentCanvas module

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index f9a8b7a..f7d7fd0 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -20,9 +20,16 @@ return function(sandbox) {
                 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', $(e.target));\r
+            });\r
+            this.node.on('mouseout', '[wlxml-tag]', function(e) {\r
+                e.stopPropagation();\r
+                sandbox.publish('nodeBlured', $(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
             });\r
@@ -182,18 +189,18 @@ return function(sandbox) {
         },\r
         highlightNode: function(node) {\r
             if(!this.gridToggled) {\r
-                node.addClass('rng-hover');\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
-                var tag = $('<div>').addClass('rng-visualEditor-nodeHoverTag').text(label);\r
+                var tag = $('<div>').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label);\r
                 node.append(tag);\r
             }\r
         },\r
         dimNode: function(node) {\r
             if(!this.gridToggled) {\r
-                node.removeClass('rng-hover');\r
-                node.find('.rng-visualEditor-nodeHoverTag').remove();\r
+                node.removeClass('rng-common-hoveredNode');\r
+                node.find('.rng-module-documentCanvas-hoveredNodeTag').remove();\r
             }\r
         },\r
         highlightNodeById: function(id) {\r
@@ -219,7 +226,7 @@ return function(sandbox) {
             this.selectNode(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
     };\r