Version 0.6.214, bug fixes X.KB.

[pettanr/clientJs.git] / 0.6.x / js / 11_hid / 01_KB.js

diff --git a/0.6.x/js/11_hid/01_KB.js b/0.6.x/js/11_hid/01_KB.js
index 83e0bfb..9d9646e 100644 (file)
--- a/0.6.x/js/11_hid/01_KB.js
+++ b/0.6.x/js/11_hid/01_KB.js
@@ -92,7 +92,7 @@ var X_KB_SPECIALS = eval( // IE5- 対策
                                                        \r
                                                case 'keypress' :\r
                                                        // keydown 側で発火しているものは再び発火しない\r
-                                                       console.log( 'keypress : chrCode:' + chrCode + ' down:' + X_KB_DOWN_KEYS[ chrCode ] + ( X_KB_CANCELED[ chrCode ] ? ' Cancel!' : '' ) );\r
+                                                       \r
                                                        if( X_KB_DOWN_KEYS[ chrCode ] ){\r
                                                                return X_KB_CANCELED[ chrCode ] ? X_CALLBACK_PREVENT_DEFAULT : cb;\r
                                                        } else\r
@@ -114,7 +114,9 @@ var X_KB_SPECIALS = eval( // IE5- 対策
                                                                        metaKey   : !!X_KB_DOWN_KEYS[ 224 ]\r
                                                                } );\r
                                                                \r
-                                                               X_KB_lastIs10Key = true;\r
+                                                               X_KB_lastIs10Key = false;\r
+                                                               \r
+                                                               console.log( X_KB_lastKeyCode + 'keypress : chrCode:' + chrCode + ' down:' + X_KB_DOWN_KEYS[ chrCode ] + ( X_KB_CANCELED[ chrCode ] ? ' Cancel!' : '' ) );\r
                                                        };\r
                                                        return cb;\r
                                                        \r
@@ -141,14 +143,21 @@ var X_KB_SPECIALS = eval( // IE5- 対策
                                                        if( X_KB_DOWN_KEYS[ keyCode ] ) delete X_KB_DOWN_KEYS[ keyCode ];\r
                                                        if( X_KB_CANCELED[ keyCode ]  ) delete X_KB_CANCELED[ keyCode ];\r
                                                        \r
-                                                       chrCode = 0;\r
+                                                       \r
                                                        if( !special ){\r
                                                                // keyCode から charCode を復帰する\r
                                                                chrCode = X_KB_TRANSFOEM[ keyCode ];\r
                                                                if( !chrCode ) return cb;\r
                                                                delete X_KB_TRANSFOEM[ keyCode ];\r
+                                                       } else\r
+                                                       if( 42 <= special ){\r
+                                                               chrCode = special; // ie8で必要... Firefox でもテンキーの+-*/ で必要...\r
+                                                       } else {\r
+                                                               chrCode = 0;\r
                                                        };\r
-                                               \r
+                                                       \r
+                                                       console.log( keyCode + ' keyup ' + chrCode );\r
+                                                       \r
                                                        cb |= this[ 'dispatch' ]( {\r
                                                                type      : 'keyup',\r
                                                                keyCode   : keyCode,\r
@@ -159,7 +168,7 @@ var X_KB_SPECIALS = eval( // IE5- 対策
                                                                altKey    : X_KB_DOWN_KEYS[ 18 ],\r
                                                                metaKey   : X_KB_DOWN_KEYS[ 224 ]\r
                                                        } );\r
-\r
+                                                       \r
                                                        return cb;\r
                                                \r
                                                case X_EVENT_VIEW_ACTIVATE :\r