Commit c592f57d authored by techird's avatar techird

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

parents b3533d2c 0efeacc2
...@@ -41,6 +41,7 @@ KityMinder.registerModule( "TextEditModule", function () { ...@@ -41,6 +41,7 @@ KityMinder.registerModule( "TextEditModule", function () {
node = selectionShape.getData('relatedNode'); node = selectionShape.getData('relatedNode');
e.stopPropagationImmediately(); e.stopPropagationImmediately();
} }
this.fire('contentchange');
km.setStatus('normal') km.setStatus('normal')
} }
if(node){ if(node){
......
...@@ -22,7 +22,7 @@ Minder.Receiver = kity.createClass('Receiver',{ ...@@ -22,7 +22,7 @@ Minder.Receiver = kity.createClass('Receiver',{
_div.setAttribute('contenteditable',true); _div.setAttribute('contenteditable',true);
_div.className = 'km_receiver'; _div.className = 'km_receiver';
this.container = document.body.insertBefore(_div,document.body.firstChild); this.container = document.body.insertBefore(_div,document.body.firstChild);
utils.addCssRule('km_receiver_css',' .km_receiver{position:absolute;padding:0;margin:0;word-wrap:break-word;}');//clip:rect(1em 1em 1em 1em); utils.addCssRule('km_receiver_css',' .km_receiver{position:absolute;padding:0;margin:0;word-wrap:break-word;clip:rect(1em 1em 1em 1em);}');//
this.km.on('textedit.beforekeyup textedit.keydown textedit.paste', utils.proxy(this.keyboardEvents,this)); this.km.on('textedit.beforekeyup textedit.keydown textedit.paste', utils.proxy(this.keyboardEvents,this));
this.timer = null; this.timer = null;
this.index = 0; this.index = 0;
......
...@@ -101,9 +101,7 @@ KityMinder.registerModule( "Select", function () { ...@@ -101,9 +101,7 @@ KityMinder.registerModule( "Select", function () {
if ( !downNode ) { if ( !downNode ) {
this.removeAllSelectedNodes(); this.removeAllSelectedNodes();
marqueeActivator.selectStart( e ); marqueeActivator.selectStart( e );
if(this.getStatus() == 'textedit'){
this.trigger('contentchange')
}
this.setStatus('normal') this.setStatus('normal')
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment