fix X.UA & X.Audio, add X.KB.

[pettanr/clientJs.git] / 0.6.x / js / 02_dom / 03_XDomEvent.js

diff --git a/0.6.x/js/02_dom/03_XDomEvent.js b/0.6.x/js/02_dom/03_XDomEvent.js
index 6ba81c8..391cdb9 100644 (file)
--- a/0.6.x/js/02_dom/03_XDomEvent.js
+++ b/0.6.x/js/02_dom/03_XDomEvent.js
@@ -1,4 +1,4 @@
-/**\r
+/*\r
  * use X.Callback\r
  * \r
  * http://d.hatena.ne.jp/uupaa/20100430/1272561922\r
@@ -42,6 +42,14 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                                this[ 'loaded' ] = e.loaded;\r
                                this[ 'total' ]  = e.total;\r
                                break;\r
+                       case 'dragstart' :\r
+                       case 'dragenter' :\r
+                       case 'dragover'  :\r
+                       case 'dragleave' :\r
+                       case 'drop'      :\r
+                       case 'dragend'   :\r
+                               this[ 'dataTransfer' ] = e.dataTransfer;\r
+                               break;\r
                };\r
                \r
                //console.log( 'original : ' + originalType + ' > ' + type );\r
@@ -133,17 +141,17 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                                                'isPrimary'     : true,\r
                                                'hwTimestamp'   : time,\r
                                                'timestamp'     : time,\r
-                                               'button'        : e.button,\r
-                                               'buttons'       : e.buttons || e.button,\r
+                                               'button'        : /*e.button ||*/ ( force ? 0 : -1 ),\r
+                                               'buttons'       : /*e.buttons || e.button ||*/ ( force ? 1 : 0 ),\r
                                                'altKey'        : altKey,\r
                                                'ctrlKey'       : ctrlKey,\r
                                                'metaKey'       : metaKey,\r
                                                'shiftKey'      : shiftKey,\r
-                                               'pointerId'     : touch.identifier + 2,\r
+                                               'pointerId'     : touch.identifier + 2, // iOS4 は 変換が必要！\r
                                                //screenX       : touch.screenX,\r
                                                //screenY       : touch.screenY,\r
-                                               'clientX'       : touch.clientX,\r
-                                               'clientY'       : touch.clientY,\r
+                                               'clientX'       : touch.clientX || ( touch.pageX - X_ViewPort_scrollX ), // iOS4以下は clientX が undefined, コードでは入れ子のスクロールに対応できない\r
+                                               'clientY'       : touch.clientY || ( touch.pageY - X_ViewPort_scrollY ),\r
                                                'pageX'         : touch.pageX,\r
                                                'pageY'         : touch.pageY,\r
                                                'offsetX'       : touch.offsetX, // 要素上の座標を取得 \r
@@ -155,6 +163,7 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                                                'width'         : touch.width || 0,\r
                                                'height'        : touch.height || 0\r
                                        };\r
+                                       console.log( 'e.pointerId = ' + touch.identifier );\r
                                };\r
                                return events.length === 1 ? events[ 0 ] : events;\r
                        } else {\r
@@ -196,7 +205,7 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                        // http://www.programming-magic.com/20090127231544/\r
                        // Opera で button==2の場合、コンテキストメニューイベントを発火 「ツール」->「設定」->「詳細設定」->「コンテンツ」->「Javascriptオプション」で「右クリックを制御するスクリプトを許可する」\r
                                if( originalType === 'mousedown' && this[ 'button' ] === 2 && X_UA[ 'Opera' ] ){\r
-                                       events = [ X_Object_clone( this ), X_Object_clone( this ) ];\r
+                                       events = [ X_Object_copy( this ), X_Object_copy( this ) ];\r
                                        events[ 1 ].type = 'contextmenu';\r
                                        return events;\r
                                };\r
@@ -204,11 +213,12 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                } else {\r
                        // Other\r
                        \r
-                       this[ 'keyCode' ]       = e.keyCode || e.which;\r
-                       this[ 'altKey' ]        = e.altKey;\r
-                       this[ 'ctrlKey' ]       = e.ctrlKey;\r
-                       this[ 'shiftKey' ]      = e.shiftKey;\r
-                       this[ 'metaKey' ]       = e.metaKey;\r
+                       this[ 'keyCode' ]       = X_Type_isFinite( e.keyCode ) ? e.keyCode : X_Type_isFinite( e.charCode ) ? e.charCode : e.which;\r
+                       this[ 'charCode' ]      = X_Type_isFinite( e.charCode ) ? e.charCode : e.which;\r
+                       this[ 'altKey' ]        = e.altKey   || !!( e.modifiers & 1 );\r
+                       this[ 'ctrlKey' ]       = e.ctrlKey  || !!( e.modifiers & 2 );\r
+                       this[ 'shiftKey' ]      = e.shiftKey || !!( e.modifiers & 4 );\r
+                       this[ 'metaKey' ]       = e.metaKey  || !!( e.modifiers & 8 );;\r
                        \r
                        this[ 'button' ]        = e.button !== undefined ? e.button :\r
                                                                 e.which !== undefined ? e.which - 1 : -1;\r
@@ -263,9 +273,11 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                if( this[ 'target' ] && !this[ 'target' ][ '_tag' ] ) this[ 'target' ] = this[ 'target' ].parent; // ie4 の fake Textnode がヒットしていないか？\r
                this[ 'currentTarget' ] = xnode; // xnode\r
                this[ 'relatedTarget' ] = X_Node_getXNode( e.formElement || e.toElement ); // xnode\r
+               this[ 'relatedTarget' ] && console.dir( 'relatide...' );\r
                this[ 'eventPhase' ]    = e.srcElement === element ? 2: 3;\r
                \r
                this[ 'keyCode' ]       = e.keyCode;\r
+               this[ 'charCode' ]      = e.keyCode;\r
                this[ 'altKey' ]        = e.altKey;\r
                this[ 'ctrlKey' ]       = e.ctrlKey;\r
                this[ 'shiftKey' ]      = e.shiftKey;           \r
@@ -435,11 +447,10 @@ if( !navigator.pointerEnabled ){
                X_Event_Rename[ 'pointerdown'     ] = 'mousedown';\r
                X_Event_Rename[ 'pointerup'       ] = 'mouseup';\r
                X_Event_Rename[ 'pointermove'     ] = 'mousemove';\r
-               X_Event_Rename[ 'pointercancel'   ] = 'mouseleave';//??\r
+               X_Event_Rename[ 'pointercancel'   ] = document.documentElement.onmouseleave !== undefined ? 'mouseleave' : 'mouseout';//??\r
                \r
                // Opera は ブラウザ設定から右クリックの通知を許可すると mousedown で e.button==2 が返る,ｷｬﾝｾﾙは可能??\r
-               X_UA[ 'Opera' ] && (\r
-               X_Event_Rename[ 'contextmenu'     ] = 'mousedown' );\r
+               X_UA[ 'Opera' ] && ( X_Event_Rename[ 'contextmenu' ] = 'mousedown' );\r
                \r
                /*\r
                 * buttons の無いブラウザには mouseup, mousedown を監視して、buttons フラグを更新し続ける\r