Merge branch 'dev' of github.com:fex-team/kityminder into dev

src/core/status.js

@@ -44,7 +44,9 @@ kity.extendClass(Minder, {
     rollbackStatus: function() {
         this.setStatus(this._rollbackStatus);
     },
-
+    getRollbackStatus:function(){
+        return this._rollbackStatus;
+    },
     getStatus: function() {
         return this._status;
     }

src/module/editor.js

@@ -214,9 +214,13 @@ KityMinder.registerModule('TextEditModule', function() {
                     if(node){
                         var offset = e.getPosition(node.getRenderContainer());
 
-                        receiver.updateSelectionByMousePosition(offset)
-                            .updateSelection(offset)
-                            .updateContainerRangeBySel();
+                        receiver
+                            .updateSelectionByMousePosition(offset)
+                            .updateSelection(offset);
+                        setTimeout(function(){
+                            receiver.updateContainerRangeBySel();
+                        });
+
 
                     }
 
@@ -297,6 +301,12 @@ KityMinder.registerModule('TextEditModule', function() {
             },
             'inputready.mousewheel textedit.mousewheel': function() {
                 receiver.setContainerStyle();
+            },
+            'statuschange':function(e){
+                if(this.getRollbackStatus() == 'textedit'){
+
+                    this.fire('contentchange');
+                }
             }
 
         }

src/module/editor.keyboard.js

@@ -108,8 +108,6 @@ Minder.keyboarder = kity.createClass('keyboarder', function(){
                 .setHoldShow();
 
 
-
-
             me.timer = setTimeout(function() {
                 if(me.selection.isShow()){
                     me.selection.setShow();

src/module/editor.selection.js

@@ -71,7 +71,7 @@ Minder.Selection = kity.createClass( 'Selection', {
             this.offset = arrOffset;
             return this;
         }
-
+        this._show = true;
     },
     updatePosition:function(offset){
         var me = this;
@@ -89,6 +89,7 @@ Minder.Selection = kity.createClass( 'Selection', {
                 me.addShape(rect);
             });
         }
+        this._show = true;
         return this;
     },
     collapse : function(toStart){