First take on diffViewer

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index ea44955..9d2e725 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -3,9 +3,10 @@
 define([\r
 'libs/underscore-min',\r
 './transformations', \r
 define([\r
 'libs/underscore-min',\r
 './transformations', \r

-'libs/text!./template.html'], function(_, transformations, template) {\r
-\r
+'./wlxmlNode',\r
+'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) {\r

 \r
 \r

+'use strict';\r

 \r
 return function(sandbox) {\r
 \r
 \r
 return function(sandbox) {\r
 \r


@@ -20,11 +21,18 @@ return function(sandbox) {
                 sandbox.publish('contentChanged');\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
             this.node.on('click', '[wlxml-tag]', function(e) {\r

+                e.stopPropagation();\r

                 console.log('clicked node type: '+e.target.nodeType);\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
             });\r
 \r
             this.node.on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) {\r


@@ -33,7 +41,7 @@ return function(sandbox) {
                     anchor = anchor.parent();\r
                 if(!anchor.is('[wlxml-tag]'))\r
                     return;\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
             });\r
             \r
             this.node.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {\r


@@ -49,7 +57,7 @@ return function(sandbox) {
                 _.each(mutation.addedNodes, function(node) {\r
                     node = $(node);\r
                     node.parent().find('[wlxml-tag]').each(function() {\r
                 _.each(mutation.addedNodes, function(node) {\r
                     node = $(node);\r
                     node.parent().find('[wlxml-tag]').each(function() {\r

-                        tag = $(this);\r
+                        var tag = $(this);\r

                         if(!tag.attr('id'))\r
                             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);}));\r
                     });\r
                         if(!tag.attr('id'))\r
                             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);}));\r
                     });\r


@@ -154,58 +162,45 @@ return function(sandbox) {
         getBody: function() {\r
             return this.node.find('#rng-module-documentCanvas-content').html();\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
             \r

-            this.node.find('.rng-module-documentCanvas-currentNode').removeClass('rng-module-documentCanvas-currentNode');\r
+            this.dimNode(wlxmlNode);\r

             \r
             \r

-            node.addClass('rng-module-documentCanvas-currentNode');\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
             \r

+            this.currentNode = wlxmlNode;\r
+            sandbox.publish('nodeSelected', wlxmlNode);\r

         },\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
             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
                 var tag = $('<div>').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label);\r

-                node.append(tag);\r
+                nodeElement.append(tag);\r

             }\r
         },\r
             }\r
         },\r

-        dimNode: function(node) {\r
+        dimNode: function(wlxmlNode) {\r
+            var nodeElement = this.getNodeElement(wlxmlNode);\r

             if(!this.gridToggled) {\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
             }\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
         selectFirstNode: function() {\r
             var firstNodeWithText = this.node.find('[wlxml-tag]').filter(function() {\r
                 return $(this).clone().children().remove().end().text().trim() !== '';\r


@@ -216,11 +211,14 @@ return function(sandbox) {
             else {\r
                 node = this.node.find('[wlxml-class|="p"]')\r
             }\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-common-hoveredNode', toggle);\r
             this.gridToggled = toggle;\r
         },\r
         toggleGrid: function(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
         }\r
     };\r
     \r


@@ -234,20 +232,26 @@ return function(sandbox) {
             var transformed = transformations.fromXML.getDocumentDescription(xml);\r
             view.setBody(transformed.HTMLTree);\r
             view.selectFirstNode();\r
             var transformed = transformations.fromXML.getDocumentDescription(xml);\r
             view.setBody(transformed.HTMLTree);\r
             view.selectFirstNode();\r

-            //isDirty = false;\r
+            sandbox.publish('documentSet');\r
+        },\r
+        getDocument: function() {\r
+            return transformations.toXML.getXML(view.getBody());\r

         },\r
         modifyCurrentNode: function(attr, value) {\r
         },\r
         modifyCurrentNode: function(attr, value) {\r

-            if(view.currentNode)\r
-                view.currentNode.attr('wlxml-'+attr, value);\r
+            if(view.currentNode) {\r
+                view.getNodeElement(view.currentNode).attr('wlxml-'+attr, value);\r
+                sandbox.publish('contentChanged');\r
+            }\r

         },\r
         },\r

-        highlightNode: function(id) {\r
-            view.highlightNodeById(id);\r
+        highlightNode: function(wlxmlNode) {\r
+            view.highlightNode(wlxmlNode);\r

         },\r
         },\r

-        dimNode: function(id) {\r
-            view.dimNodeById(id);\r
+        dimNode: function(wlxmlNode) {\r
+            view.dimNode(wlxmlNode);\r

         },\r
         },\r

-        selectNode: function(id) {\r
-            view.selectNodeById(id);\r
+        selectNode: function(wlxmlNode) {\r
+            if(!wlxmlNode.is(view.currentNode))\r
+                view.selectNode(wlxmlNode, {moveCarret: true});\r

         },\r
         toggleGrid: function(toggle) {\r
             view.toggleGrid(toggle);\r
         },\r
         toggleGrid: function(toggle) {\r
             view.toggleGrid(toggle);\r