Layout informs its views on being shown

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

diff --git a/modules/documentCanvas/documentCanvas.js b/modules/documentCanvas/documentCanvas.js
index df11ea0..51acbf3 100644 (file)
--- a/modules/documentCanvas/documentCanvas.js
+++ b/modules/documentCanvas/documentCanvas.js
@@ -6,7 +6,7 @@ define([
 './wlxmlNode',\r
 'libs/text!./template.html'], function(_, transformations, wlxmlNode, template) {\r
 \r
-\r
+'use strict';\r
 \r
 return function(sandbox) {\r
 \r
@@ -50,23 +50,6 @@ return function(sandbox) {
                     view.insertNewNode(null, null);\r
                 }\r
             });\r
-            \r
-            \r
-            var observer = new MutationObserver(function(mutations) {\r
-              mutations.forEach(function(mutation) {\r
-                _.each(mutation.addedNodes, function(node) {\r
-                    node = $(node);\r
-                    node.parent().find('[wlxml-tag]').each(function() {\r
-                        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
-                });\r
-              });    \r
-            });\r
-            var config = { attributes: true, childList: true, characterData: true, subtree: true };\r
-            observer.observe(this.node.find('#rng-module-documentCanvas-contentWrapper')[0], config);\r
-            \r
             this.gridToggled = false;\r
         },\r
         _createNode: function(wlxmlTag, wlxmlClass) {\r
@@ -76,6 +59,7 @@ return function(sandbox) {
             toret.attr('wlxml-tag', wlxmlTag);\r
             if(wlxmlClass)\r
                 toret.attr('wlxml-class', wlxmlClass);\r
+            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);}));\r
             return toret;\r
         },\r
         insertNewNode: function(wlxmlTag, wlxmlClass) {\r
@@ -100,7 +84,7 @@ return function(sandbox) {
                 anchor.before(newNode)\r
             else\r
                 anchor.after(newNode);\r
-            this.selectNode(newNode);\r
+            this.selectNode(new wlxmlNode.Node(newNode), {moveCarret: true});\r
             //isDirty = true;\r
             sandbox.publish('contentChanged');\r
         },\r
@@ -124,7 +108,7 @@ return function(sandbox) {
                 newNode.before(prefix);\r
                 newNode.after(suffix);\r
                 \r
-                this.selectNode(newNode);\r
+                this.selectNode(new wlxmlNode.Node(newNode), {moveCarret: true});\r
                 //isDirty = true;\r
                 sandbox.publish('contentChanged');\r
             }\r
@@ -151,7 +135,7 @@ return function(sandbox) {
                 newNode.before(prefixNode);\r
                 newNode.after(suffixNode);\r
                 \r
-                this.selectNode(newNode);\r
+                this.selectNode(new wlxmlNode.Node(newNode), {moveCarret: true});\r
                 //isDirty = true;\r
                 sandbox.publish('contentChanged');\r
             }\r
@@ -239,8 +223,8 @@ return function(sandbox) {
         },\r
         modifyCurrentNode: function(attr, value) {\r
             if(view.currentNode) {\r
-                view.currentNode.attr('wlxml-'+attr, value);\r
-                sandbox.publish('contentEdited');\r
+                view.getNodeElement(view.currentNode).attr('wlxml-'+attr, value);\r
+                sandbox.publish('contentChanged');\r
             }\r
         },\r
         highlightNode: function(wlxmlNode) {\r