by zhanyi

src/core/minder.command.js

@@ -84,7 +84,7 @@ kity.extendClass( Minder, {
 
 			result = command.execute.apply( command, [ me ].concat( cmdArgs ) );
 
-			this._fire( new MinderEvent( name.toLowerCase(), eventParams, false ) );
+            this._fire( new MinderEvent( "command", eventParams, false ) );
 
 		}
 

src/module/connect.js

@@ -134,7 +134,7 @@ var ConnectModule = KityMinder.registerModule( "ConnectModule", function () {
     } )() );
     return {
         "events": {
-			"rendernode": function ( e ) {
+            "command": function ( e ) {
                 var command = e;
                 var minder = this;
                 switch ( command.commandName ) {

src/module/editor.js

@@ -25,11 +25,13 @@ KityMinder.registerModule( "TextEditModule", function () {
 
 
                     receiver.setCursor(cursor)
+                        .setKityMinder(this)
+                        .setMinderNode(e.getTargetNode())
                         .setTextShape(targetShape)
                         .setCursorHeight()
                         .setCurrentIndex(position)
                         .updateCursor()
-                        .setRange(range)
+                        .setRange(range);
 
                 }
             },

src/module/editor.receiver.js

@@ -52,12 +52,23 @@ Minder.Receiver = kity.createClass('Receiver',{
         paper.addShape(this.textShape);
         return this;
     },
+    setKityMinder:function(km){
+        this.km = km;
+        return this;
+    },
+    setMinderNode:function(node){
+        this.minderNode = node;
+        return this;
+    },
     keyboardEvents : function(e){
         clearTimeout(this.timer);
         var me = this;
         switch(e.type){
             case 'keyup':
-                this.textShape.setContent((this.container.textContent || this.container.innerText).replace(/\u200b/g,''));
+                var text = (this.container.textContent || this.container.innerText).replace(/\u200b/g,'');
+                this.textShape.setContent(text);
+                this.minderNode.setData('text',text);
+                this.km.execCommand('renderNode',this.minderNode);
                 this.updateTextData();
                 this.updateCursor();
                 this.timer = setTimeout(function(){

src/module/layout.js

@@ -60,14 +60,12 @@ KityMinder.registerModule( "LayoutModule", function () {
 					var part2 = ( children[ j + 1 ] ? ( children[ j + 1 ].getData( "branchheight" ) - 10 ) / 2 : 0 );
 					sY += ( part1 + part2 );
 				}
-				km.fire( "rendernode", {
-					nodes: children,
-					rerender: false
-				} );
+                km.execCommand( "rendernode", children );
 			}
 		}
 	};
 
+
 	var setX = function ( node ) {
 		var parent = node.getParent();
 		if ( !parent ) return false;
@@ -172,10 +170,7 @@ KityMinder.registerModule( "LayoutModule", function () {
 			reAnalyze( km, layerArray, appendSide );
 		} else {
 			_node.setData( "y", _node.getParent().getData( "y" ) );
-			km.fire( "rendernode", {
-				nodes: _node,
-				rerender: false
-			} );
+            km.execCommand( "rendernode", _node );
 		}
 		return _node;
 	};
@@ -253,33 +248,7 @@ KityMinder.registerModule( "LayoutModule", function () {
 		},
 
 		"events": {
-			"contentupdate": function ( e ) {
-				var me = this;
-				updateNode( me, e.node );
-			},
-			"noderendercomplete": function ( e ) {
-				if ( !e.rerender ) return false;
-				var parent = e.node;
-				var nodes = [];
-				parent.preTraverse( function ( node ) {
-					var prt = node.getParent();
-					if ( !prt ) return false;
-					var parentWidth = prt.getData( "width" );
-					var parentX = prt.getData( "x" );
-					if ( parent.getData( "align" ) === "center" ) parentWidth = parentWidth / 2;
 
-					if ( parent.getData( "appendside" ) === "left" ) {
-						node.setData( "x", parentX - parentWidth - 50 );
-					} else {
-						node.setData( "x", parentX + parentWidth + 50 );
-					}
-					nodes.push( node );
-				} );
-				this.fire( "rendernode", {
-					nodes: nodes,
-					rerender: false
-				} );
-			}
 		}
 	};
 } );
\ No newline at end of file

src/module/render.js

 KityMinder.registerModule( "RenderModule", function () {
+    var RenderNodeCommand = kity.createClass( "RenderNodeCommand", ( function () {
         var MinderNodeShape = kity.createClass( "MinderNodeShape", ( function () {
             return {
                 constructor: function ( container ) {
@@ -17,7 +18,7 @@ KityMinder.registerModule( "RenderModule", function () {
             };
         } )() );
         var renderNode = function ( km, node ) {
-        console.log( km, node );
+
             var styledefault = {
                 radius: 10,
                 fill: "yellow",
@@ -42,8 +43,6 @@ KityMinder.registerModule( "RenderModule", function () {
 
             var _rectWidth = txtWidth + _padding[ 1 ] + _padding[ 3 ];
             var _rectHeight = txtHeight + _padding[ 0 ] + _padding[ 2 ];
-        node.setData( "width", _rectWidth );
-        node.setData( "height", _rectHeight );
             nodeShape.text
                 .setX( _padding[ 3 ] ).setY( _padding[ 0 ] + txtHeight );
 
@@ -71,13 +70,10 @@ KityMinder.registerModule( "RenderModule", function () {
                 for ( var i = 0; i < node.length; i++ ) {
                     renderNode( km, node[ i ] );
                 }
-            return false;
             } else {
                 renderNode( km, node );
-            return true;
             }
         };
-    var RenderNodeCommand = kity.createClass( "RenderNodeCommand", ( function () {
         return {
             base: Command,
             execute: renderNodes
@@ -100,16 +96,6 @@ KityMinder.registerModule( "RenderModule", function () {
             },
             "keydown keyup": function ( e ) {
 
-            },
-            "rendernode": function ( e ) {
-                var nodes = e.nodes;
-                var rerender = e.rerender;
-                renderNodes( this, nodes );
-
-                this.fire( "noderendercomplete", {
-                    node: nodes,
-                    rerender: rerender
-                } );
             }
         }
     };