Commit 96d15e5b authored by campaign's avatar campaign

修复文字输入

parent 6bac8cd1
...@@ -29,7 +29,7 @@ Minder.Receiver = kity.createClass( 'Receiver', { ...@@ -29,7 +29,7 @@ Minder.Receiver = kity.createClass( 'Receiver', {
me.keyboardEvents.call( me, new MinderEvent( e.type == 'keyup' ? "beforekeyup" : e.type, e ) ) me.keyboardEvents.call( me, new MinderEvent( e.type == 'keyup' ? "beforekeyup" : e.type, e ) )
} ) } )
} }
utils.addCssRule( 'km_receiver_css', ' .km_receiver{white-space:nowrap;position:absolute;padding:0;margin:0;word-wrap:break-word;clip:rect(1em 1em 1em 1em);}' ); // utils.addCssRule( 'km_receiver_css', ' .km_receiver{white-space:nowrap;position:absolute;padding:0;margin:0;word-wrap:break-word;}' ); //clip:rect(1em 1em 1em 1em);
this.km.on( 'textedit.beforekeyup textedit.keydown textedit.keypress textedit.paste', utils.proxy( this.keyboardEvents, this ) ); this.km.on( 'textedit.beforekeyup textedit.keydown textedit.keypress textedit.paste', utils.proxy( this.keyboardEvents, this ) );
this.timer = null; this.timer = null;
this.index = 0; this.index = 0;
...@@ -125,8 +125,8 @@ Minder.Receiver = kity.createClass( 'Receiver', { ...@@ -125,8 +125,8 @@ Minder.Receiver = kity.createClass( 'Receiver', {
switch ( e.type ) { switch ( e.type ) {
case 'keydown': case 'keydown':
var keyCode = e.originEvent.keyCode;
this.isTypeText = e.originEvent.keyCode == 229; this.isTypeText = keyCode == 229 && keyCode === 0;
switch ( e.originEvent.keyCode ) { switch ( e.originEvent.keyCode ) {
case keys.Enter: case keys.Enter:
case keys.Tab: case keys.Tab:
...@@ -184,7 +184,9 @@ Minder.Receiver = kity.createClass( 'Receiver', { ...@@ -184,7 +184,9 @@ Minder.Receiver = kity.createClass( 'Receiver', {
case keymap.Enter: case keymap.Enter:
case keymap.Tab: case keymap.Tab:
case keymap.F2: case keymap.F2:
if(keymap.Enter == keyCode && this.isTypeText){
if(keymap.Enter == keyCode ){
setTextToContainer(); setTextToContainer();
} }
if ( this.keydownNode === this.minderNode ) { if ( this.keydownNode === this.minderNode ) {
...@@ -253,7 +255,7 @@ Minder.Receiver = kity.createClass( 'Receiver', { ...@@ -253,7 +255,7 @@ Minder.Receiver = kity.createClass( 'Receiver', {
}, },
setContainerStyle: function () { setContainerStyle: function () {
var textShapeBox = this.getBaseOffset( 'screen' ); var textShapeBox = this.getBaseOffset( 'screen' );
this.container.style.cssText = ";left:" + textShapeBox.x + 'px;top:' + ( textShapeBox.y - 5 ) + 'px;width:' + textShapeBox.width + 'px;height:' + textShapeBox.height + 'px;'; this.container.style.cssText = ";left:" + textShapeBox.x + 'px;top:' + ( textShapeBox.y - 35 ) + 'px;width:' + textShapeBox.width + 'px;height:' + textShapeBox.height + 'px;';
if ( !this.selection.isShow() ) { if ( !this.selection.isShow() ) {
var paperContainer = this.km.getPaper(); var paperContainer = this.km.getPaper();
......
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