Version 0.6.167, add X.Audio.canPlay.

[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..4ab70dd 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
@@ -435,11 +444,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