Version 0.6.213, add X.Node.TextRange.

[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 7c94b06..bc7abf0 100644 (file)
--- a/0.6.x/js/02_dom/03_XDomEvent.js
+++ b/0.6.x/js/02_dom/03_XDomEvent.js
@@ -19,6 +19,11 @@ var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.de
                '3' : 'pen',\r
                '4' : 'mouse'\r
        }; */\r
+       /*\r
+        * https://github.com/markleusink/ios-html5-drag-drop-shim/blob/master/ios-drag-drop.js\r
+        */\r
+       X_Dom_Event_coordinateSystemForElementFromPoint = X_UA[ 'iOS' ] < 5 ? 'page' : 'client', // iOS4 以下は clientX が undeifned...\r
+       \r
        X_Dom_Event_CANCEL_MOUSE = {},\r
        X_DomEvent;\r
 \r
@@ -31,9 +36,10 @@ if( X_Dom_Event_devicePixelRatio !== 1 ){
 if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){\r
        X_DomEvent = function( e, xnode ){\r
                var originalType = e.type,\r
+                       isNum = X_Type_isNumber,\r
                        type, pointerEventType,\r
                        touches, events,\r
-                       altKey, ctrlKey, metaKey, shiftKey, target, related, force,\r
+                       altKey, ctrlKey, metaKey, shiftKey, target, xtarget, offset, related, force,\r
                        elm, i, n, time, touch, ev;\r
                \r
                //this._event        = e;\r
@@ -63,11 +69,13 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                //console.log( 'original : ' + originalType + ' > ' + type );\r
                // http://msdn.microsoft.com/ja-jp/library/ie/dn304886%28v=vs.85%29.aspx\r
                // ポインター イベントの更新\r
-               if( e.pointerType ){\r
+               if( e.pointerType ||\r
+                       // IE11 の IE10 モードで click イベントの pointerType が undefined\r
+                       ( X_UA[ 'IE' ] === 10 && type === 'click' && ( e.pointerType = 'mouse' ) ) ){\r
                        // PointerEvent;\r
                        if( X_Dom_Event_convertMSPointerType ){\r
                                this[ 'pointerType' ]   = X_Dom_Event_convertMSPointerType[ e.pointerType ];\r
-                               this[ 'pressure' ]      = e.pressure || ( e.button !== -1 ? 0.5 : 0 );\r
+                               this[ 'pressure' ]      = isNum( e.pressure ) ? e.pressure : ( e.button !== -1 ? 0.5 : 0 );\r
                                // ポインターの接触形状の スクリーン ピクセル単位の幅と高さ なので変換。(多分、、、)\r
                                this[ 'width' ]         = e.width  / X_Dom_Event_devicePixelRatio;\r
                                this[ 'height' ]        = e.height / X_Dom_Event_devicePixelRatio;\r
@@ -139,11 +147,16 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                                for( i = touches.length; i; ){\r
                                        touch   = touches[ --i ];\r
                                        target  = touch.target;\r
+                                       target  = target.nodeType === 3 ? target.parentNode : target;\r
+                                       xtarget = X_Node_getXNode( target );\r
+                                       // https://developer.mozilla.org/en/docs/Web/API/Element/getBoundingClientRect\r
+                                       // Android 2+, iOS4+\r
+                                       offset  = X_UA[ 'iOS' ] < 5 ? xtarget.offset() : target.getBoundingClientRect();\r
                                        related = touch.relatedTarget;\r
                                        events[ i ] = {\r
                                                'type'          : pointerEventType,\r
                                                'pointerType'   : 'touch',\r
-                                               'target'        : X_Node_getXNode( target.nodeType === 3 ? target.parentNode : target ),// defeat Safari bug // xnodetouch.target,\r
+                                               'target'        : xtarget,// defeat Safari bug // xnodetouch.target,\r
                                                'currentTarget' : xnode,\r
                                                'relatedTarget' : related && X_Node_getXNode( related.nodeType === 3 ? related.parentNode : related ), // xnode iOS3 には relatedTarget がない\r
                                                'isPrimary'     : true,\r
@@ -158,12 +171,17 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                                                'pointerId'     : touch.identifier + 2, // iOS4 は 変換が必要！\r
                                                //screenX       : touch.screenX,\r
                                                //screenY       : touch.screenY,\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
-                                               'offsetY'       : touch.offsetY,\r
+                                               'pageY'         : touch.pageY,                                          \r
+                                               // iOS4 以下では clientX が undef, pageX から scrollLeft を引く.\r
+                                               // TODO getter にする?\r
+                                               'clientX'       : isNum( touch.clientX ) ? touch.clientX : ( touch.pageX - X_ViewPort_scrollX ),\r
+                                               'clientY'       : isNum( touch.clientY ) ? touch.clientY : ( touch.pageY - X_ViewPort_scrollY ),\r
+                                               // 要素上の座標を取得\r
+                                               // iOS8 でも offsetX が undef, iOS4　以下では pageX - offset.x, iOS5 以上は clientX - getBCR.left\r
+                                               // TODO getter にする?\r
+                                               'offsetX'       : isNum( touch.offsetX ) ? touch.offsetX : touch[ X_Dom_Event_coordinateSystemForElementFromPoint + 'X' ] - ( offset.x || offset.left || 0 ), \r
+                                               'offsetY'       : isNum( touch.offsetY ) ? touch.offsetY : touch[ X_Dom_Event_coordinateSystemForElementFromPoint + 'Y' ] - ( offset.y || offset.top  || 0 ),\r
                                                'radiusX'       : touch.radiusX || 0,\r
                                                'radiusY'       : touch.radiusY || 0,\r
                                                'rotationAngle' : touch.rotationAngle || 0,\r
@@ -172,6 +190,7 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                                                'height'        : touch.height || 0\r
                                        };\r
                                        //console.log( 'e.pointerId = ' + touch.identifier );\r
+                                       //X_UA[ 'iOS' ] < 5 && console.log( pointerEventType + ':[' + events[ i ].pageX + ',' + events[ i ].pageY + ']' + events[ i ].pointerId );\r
                                };\r
                                return events.length === 1 ? events[ 0 ] : events;\r
                        } else {\r
@@ -206,8 +225,8 @@ if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){
                                this[ 'clientY' ]       = e.clientY;\r
                                this[ 'pageX' ]         = e.pageX;\r
                                this[ 'pageY' ]         = e.pageY;\r
-                               this[ 'offsetX' ]       = e.offsetX || e.layerX; // 要素上の座標を取得 \r
-                               this[ 'offsetY' ]       = e.offsetY || e.layerY;\r
+                               this[ 'offsetX' ]       = isNum( e.offsetX ) ? e.offsetX : e.layerX; // 要素上の座標を取得 \r
+                               this[ 'offsetY' ]       = isNum( e.offsetY ) ? e.offsetY : e.layerY;\r
                                \r
                        // http://www.programming-magic.com/20090127231544/\r
                        // Opera で button==2の場合、コンテキストメニューイベントを発火 「ツール」->「設定」->「詳細設定」->「コンテンツ」->「Javascriptオプション」で「右クリックを制御するスクリプトを許可する」\r