X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F11_hid%2F01_KB.js;fp=0.6.x%2Fjs%2F11_hid%2F01_KB.js;h=83e0bfbc1747d0bea8b6e3fbcb1da989acc0edaa;hp=26d1544acced357883f98d1d041b4a71e4348987;hb=009b1cd0cebdd15591a9abfb964fb57b41ccb5f9;hpb=3d10dbbb167c89638f3bea6c267de8763274d30c

diff --git a/0.6.x/js/11_hid/01_KB.js b/0.6.x/js/11_hid/01_KB.js
index 26d1544..83e0bfb 100644
--- a/0.6.x/js/11_hid/01_KB.js
+++ b/0.6.x/js/11_hid/01_KB.js
@@ -42,7 +42,7 @@ var X_KB_SPECIALS = eval( // IE5- 対策
 					var keyCode = e.keyCode,  // keyCode says something about the actual keyboard key the user pressed
 						chrCode = e.charCode, // while charCode gives the ASCII value of the resulting character
 						cb      = X_CALLBACK_NONE,
-						special, is10Key, _keyCode;
+						special, _keyCode;
 					
 					console.log( e.type + ' > keyCode:' + keyCode + ' chrCode:' + chrCode );
 					
@@ -66,15 +66,15 @@ var X_KB_SPECIALS = eval( // IE5- 対策
 								};
 								
 								cb = this[ 'dispatch' ]( {
-									type     : 'keydown',
-									keyCode  : keyCode,
-									charCode : chrCode,
-									keyName  : X_Type_isString( special ) ? special : '',
-									is10key  : !!is10Key,
-									shiftKey : !!X_KB_DOWN_KEYS[ 16 ],
-									ctrlKey  : !!X_KB_DOWN_KEYS[ 17 ],
-									altKey   : !!X_KB_DOWN_KEYS[ 18 ],
-									metaKey  : !!X_KB_DOWN_KEYS[ 224 ]
+									type      : 'keydown',
+									keyCode   : keyCode,
+									charCode  : chrCode,
+									'keyName' : X_Type_isString( special ) ? special : '',
+									'is10key' : !!X_KB_lastIs10Key,
+									shiftKey  : !!X_KB_DOWN_KEYS[ 16 ],
+									ctrlKey   : !!X_KB_DOWN_KEYS[ 17 ],
+									altKey    : !!X_KB_DOWN_KEYS[ 18 ],
+									metaKey   : !!X_KB_DOWN_KEYS[ 224 ]
 								} );
 								
 								if( cb & X_CALLBACK_PREVENT_DEFAULT ){
@@ -97,21 +97,21 @@ var X_KB_SPECIALS = eval( // IE5- 対策
 								return X_KB_CANCELED[ chrCode ] ? X_CALLBACK_PREVENT_DEFAULT : cb;
 							} else
 							if( keyCode === 32 ){
-								charCode = 32;
+								chrCode = 32;
 							};
 
 							if( 32 <= chrCode && chrCode <= 126 ){
 								X_KB_TRANSFOEM[ X_KB_lastKeyCode ] = chrCode;
 								
 								cb = this[ 'dispatch' ]( {
-									type     : 'keydown',
-									keyCode  : X_KB_lastIs10Key ? X_KB_lastKeyCode : 0,
-									charCode : chrCode,
-									is10key  : X_KB_lastIs10Key,
-									shiftKey : !!X_KB_DOWN_KEYS[ 16 ],
-									ctrlKey  : !!X_KB_DOWN_KEYS[ 17 ],
-									altKey   : !!X_KB_DOWN_KEYS[ 18 ],
-									metaKey  : !!X_KB_DOWN_KEYS[ 224 ]
+									type      : 'keydown',
+									keyCode   : X_KB_lastIs10Key ? X_KB_lastKeyCode : 0,
+									charCode  : chrCode,
+									'is10key' : X_KB_lastIs10Key,
+									shiftKey  : !!X_KB_DOWN_KEYS[ 16 ],
+									ctrlKey   : !!X_KB_DOWN_KEYS[ 17 ],
+									altKey    : !!X_KB_DOWN_KEYS[ 18 ],
+									metaKey   : !!X_KB_DOWN_KEYS[ 224 ]
 								} );
 								
 								X_KB_lastIs10Key = true;
@@ -125,16 +125,16 @@ var X_KB_SPECIALS = eval( // IE5- 対策
 						
 							if( ( special = X_KB_SPECIALS[ keyCode ] ) && ( !X_KB_DOWN_KEYS[ keyCode ] && !X_KB_DOWN_KEYS[ special ] ) ){
 								cb |= this[ 'dispatch' ]( {
-									type      : 'keydown',
-									keyCode   : keyCode,
-									charCode  : 0,
-									keyName   : special,
-									is10key   : false,
-									isVirtual : true,
-									shiftKey  : !!X_KB_DOWN_KEYS[ 16 ],
-									ctrlKey   : !!X_KB_DOWN_KEYS[ 17 ],
-									altKey    : !!X_KB_DOWN_KEYS[ 18 ],
-									metaKey   : !!X_KB_DOWN_KEYS[ 224 ]
+									type        : 'keydown',
+									keyCode     : keyCode,
+									charCode    : 0,
+									'keyName'   : special,
+									'is10key'   : false,
+									'isVirtual' : true,
+									shiftKey    : !!X_KB_DOWN_KEYS[ 16 ],
+									ctrlKey     : !!X_KB_DOWN_KEYS[ 17 ],
+									altKey      : !!X_KB_DOWN_KEYS[ 18 ],
+									metaKey     : !!X_KB_DOWN_KEYS[ 224 ]
 								} );
 							};
 						
@@ -150,14 +150,14 @@ var X_KB_SPECIALS = eval( // IE5- 対策
 							};
 						
 							cb |= this[ 'dispatch' ]( {
-								type     : 'keyup',
-								keyCode  : keyCode,
-								charCode : chrCode,
-								keyName  : X_Type_isString( special ) ? special : '',
-								shiftKey : X_KB_DOWN_KEYS[ 16 ],
-								ctrlKey  : X_KB_DOWN_KEYS[ 17 ],
-								altKey   : X_KB_DOWN_KEYS[ 18 ],
-								metaKey  : X_KB_DOWN_KEYS[ 224 ]
+								type      : 'keyup',
+								keyCode   : keyCode,
+								charCode  : chrCode,
+								'keyName' : X_Type_isString( special ) ? special : '',
+								shiftKey  : X_KB_DOWN_KEYS[ 16 ],
+								ctrlKey   : X_KB_DOWN_KEYS[ 17 ],
+								altKey    : X_KB_DOWN_KEYS[ 18 ],
+								metaKey   : X_KB_DOWN_KEYS[ 224 ]
 							} );
 
 							return cb;