X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/5d5c067b7e0d6523a16e73f79b0dc4b70ba6baa7..b7266f76b76a0a67000144d2780a8f64967fafb4:/modules/documentCanvas/documentCanvas.js?ds=sidebyside

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index 93d1866..51acbf3 100644
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -3,9 +3,10 @@
 define([
 'libs/underscore-min',
 './transformations', 
-'libs/text!./template.html'], function(_, transformations, template) {
-
+'./wlxmlNode',
+'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) {
 
+'use strict';
 
 return function(sandbox) {
 
@@ -20,11 +21,18 @@ return function(sandbox) {
                 sandbox.publish('contentChanged');
             });
 
-            this.node.on('mouseover', '[wlxml-tag]', function(e) { sandbox.publish('nodeHovered', $(e.target)); });
-            this.node.on('mouseout', '[wlxml-tag]', function(e) { sandbox.publish('nodeBlured', $(e.target)); });
+            this.node.on('mouseover', '[wlxml-tag]', function(e) {
+                e.stopPropagation();
+                sandbox.publish('nodeHovered', new wlxmlNode.Node($(e.target)));
+            });
+            this.node.on('mouseout', '[wlxml-tag]', function(e) {
+                e.stopPropagation();
+                sandbox.publish('nodeBlured', new wlxmlNode.Node($(e.target)));
+            });
             this.node.on('click', '[wlxml-tag]', function(e) {
+                e.stopPropagation();
                 console.log('clicked node type: '+e.target.nodeType);
-                view._markSelected($(e.target));
+                view.selectNode(new wlxmlNode.Node($(e.target)));
             });
 
             this.node.on('keyup', '#rng-module-documentCanvas-contentWrapper', function(e) {
@@ -33,7 +41,7 @@ return function(sandbox) {
                     anchor = anchor.parent();
                 if(!anchor.is('[wlxml-tag]'))
                     return;
-                view._markSelected(anchor);
+                view.selectNode(new wlxmlNode.Node(anchor));
             });
             
             this.node.on('keydown', '#rng-module-documentCanvas-contentWrapper', function(e) {
@@ -42,23 +50,6 @@ return function(sandbox) {
                     view.insertNewNode(null, null);
                 }
             });
-            
-            
-            var observer = new MutationObserver(function(mutations) {
-              mutations.forEach(function(mutation) {
-                _.each(mutation.addedNodes, function(node) {
-                    node = $(node);
-                    node.parent().find('[wlxml-tag]').each(function() {
-                        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);}));
-                    });
-                });
-              });    
-            });
-            var config = { attributes: true, childList: true, characterData: true, subtree: true };
-            observer.observe(this.node.find('#rng-module-documentCanvas-contentWrapper')[0], config);
-            
             this.gridToggled = false;
         },
         _createNode: function(wlxmlTag, wlxmlClass) {
@@ -68,6 +59,7 @@ return function(sandbox) {
             toret.attr('wlxml-tag', wlxmlTag);
             if(wlxmlClass)
                 toret.attr('wlxml-class', wlxmlClass);
+            toret.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);}));
             return toret;
         },
         insertNewNode: function(wlxmlTag, wlxmlClass) {
@@ -92,7 +84,7 @@ return function(sandbox) {
                 anchor.before(newNode)
             else
                 anchor.after(newNode);
-            this.selectNode(newNode);
+            this.selectNode(new wlxmlNode.Node(newNode), {moveCarret: true});
             //isDirty = true;
             sandbox.publish('contentChanged');
         },
@@ -116,7 +108,7 @@ return function(sandbox) {
                 newNode.before(prefix);
                 newNode.after(suffix);
                 
-                this.selectNode(newNode);
+                this.selectNode(new wlxmlNode.Node(newNode), {moveCarret: true});
                 //isDirty = true;
                 sandbox.publish('contentChanged');
             }
@@ -143,7 +135,7 @@ return function(sandbox) {
                 newNode.before(prefixNode);
                 newNode.after(suffixNode);
                 
-                this.selectNode(newNode);
+                this.selectNode(new wlxmlNode.Node(newNode), {moveCarret: true});
                 //isDirty = true;
                 sandbox.publish('contentChanged');
             }
@@ -154,58 +146,45 @@ return function(sandbox) {
         getBody: function() {
             return this.node.find('#rng-module-documentCanvas-content').html();
         }, 
-        _markSelected: function(node) {
-            this.dimNode(node);
+        selectNode: function(wlxmlNode, options) {
+            options = options || {};
+            var nodeElement = this.getNodeElement(wlxmlNode)
             
-            this.node.find('.rng-current').removeClass('rng-current');
+            this.dimNode(wlxmlNode);
             
-            node.addClass('rng-current');
-
-            this.currentNode = node;
-            sandbox.publish('nodeSelected', node);
+            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(nodeElement[0]);
+                range.collapse(false);
+                var selection = document.getSelection();
+                selection.removeAllRanges()
+                selection.addRange(range);
+            }
             
+            this.currentNode = wlxmlNode;
+            sandbox.publish('nodeSelected', wlxmlNode);
         },
-        selectNode: function(node) {
-            view._markSelected(node);
-            var range = document.createRange();
-            range.selectNodeContents(node[0]);
-            range.collapse(false);
-
-            var selection = document.getSelection();
-            selection.removeAllRanges()
-            selection.addRange(range);
-        },
-        selectNodeById: function(id) {
-            var node = this.node.find('#'+id);
-            if(node)
-                this.selectNode(node);
-        },
-        highlightNode: function(node) {
+        highlightNode: function(wlxmlNode) {
+            var nodeElement = this.getNodeElement(wlxmlNode);
             if(!this.gridToggled) {
-                node.addClass('rng-hover');
-                var label = node.attr('wlxml-tag');
-                if(node.attr('wlxml-class'))
-                    label += ' / ' + node.attr('wlxml-class');
-                var tag = $('<div>').addClass('rng-visualEditor-nodeHoverTag').text(label);
-                node.append(tag);
+                nodeElement.addClass('rng-common-hoveredNode');
+                var label = nodeElement.attr('wlxml-tag');
+                if(nodeElement.attr('wlxml-class'))
+                    label += ' / ' + nodeElement.attr('wlxml-class');
+                var tag = $('<div>').addClass('rng-module-documentCanvas-hoveredNodeTag').text(label);
+                nodeElement.append(tag);
             }
         },
-        dimNode: function(node) {
+        dimNode: function(wlxmlNode) {
+            var nodeElement = this.getNodeElement(wlxmlNode);
             if(!this.gridToggled) {
-                node.removeClass('rng-hover');
-                node.find('.rng-visualEditor-nodeHoverTag').remove();
+                nodeElement.removeClass('rng-common-hoveredNode');
+                nodeElement.find('.rng-module-documentCanvas-hoveredNodeTag').remove();
             }
         },
-        highlightNodeById: function(id) {
-            var node = this.node.find('#'+id);
-            if(node)
-                this.highlightNode(node);
-        },
-        dimNodeById: function(id) {
-            var node = this.node.find('#'+id);
-            if(node)
-                this.dimNode(node);
-        },
         selectFirstNode: function() {
             var firstNodeWithText = this.node.find('[wlxml-tag]').filter(function() {
                 return $(this).clone().children().remove().end().text().trim() !== '';
@@ -216,11 +195,14 @@ return function(sandbox) {
             else {
                 node = this.node.find('[wlxml-class|="p"]')
             }
-            this.selectNode(node);
+            this.selectNode(new wlxmlNode.Node(node));
         },
         toggleGrid: function(toggle) {
-            this.node.find('[wlxml-tag]').toggleClass('rng-hover', toggle);
+            this.node.find('[wlxml-tag]').toggleClass('rng-common-hoveredNode', toggle);
             this.gridToggled = toggle;
+        },
+        getNodeElement: function(wlxmlNode) {
+            return this.node.find('#'+wlxmlNode.id);
         }
     };
     
@@ -234,22 +216,36 @@ return function(sandbox) {
             var transformed = transformations.fromXML.getDocumentDescription(xml);
             view.setBody(transformed.HTMLTree);
             view.selectFirstNode();
-            //isDirty = false;
+            sandbox.publish('documentSet');
+        },
+        getDocument: function() {
+            return transformations.toXML.getXML(view.getBody());
         },
         modifyCurrentNode: function(attr, value) {
-            if(view.currentNode)
-                view.currentNode.attr('wlxml-'+attr, value);
+            if(view.currentNode) {
+                view.getNodeElement(view.currentNode).attr('wlxml-'+attr, value);
+                sandbox.publish('contentChanged');
+            }
         },
-        highlightNode: function(id) {
-            view.highlightNodeById(id);
+        highlightNode: function(wlxmlNode) {
+            view.highlightNode(wlxmlNode);
         },
-        dimNode: function(id) {
-            view.dimNodeById(id);
+        dimNode: function(wlxmlNode) {
+            view.dimNode(wlxmlNode);
         },
-        selectNode: function(id) {
-            view.selectNodeById(id);
+        selectNode: function(wlxmlNode) {
+            if(!wlxmlNode.is(view.currentNode))
+                view.selectNode(wlxmlNode, {moveCarret: true});
+        },
+        toggleGrid: function(toggle) {
+            view.toggleGrid(toggle);
+        },
+        insertNewNode: function(wlxmlTag, wlxmlClass) {
+            view.insertNewNode(wlxmlTag, wlxmlClass);
+        },
+        wrapSelectionWithNewNode: function(wlxmlTag, wlxmlClass) {
+            view.wrapSelectionWithNewNode(wlxmlTag, wlxmlClass);
         }
-        
     }
     
 };