Version 0.6.133, fix for closure compiler - ADVANCED_OPTIMIZATIONS

[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 ec27fb1..16ab951 100644 (file)
--- a/0.6.x/js/02_dom/03_XDomEvent.js
+++ b/0.6.x/js/02_dom/03_XDomEvent.js
@@ -18,10 +18,10 @@ var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.de
                '4' : 'mouse'\r
        }; */\r
 \r
-if( !X_UA.IE || 9 <= X_UA.IE ){\r
+if( !X_UA[ 'IE' ] || 9 <= X_UA[ 'IE' ] ){\r
        X.Dom.Event = function( e, xnode ){\r
                var originalType = e.type,\r
-                       type, pointerType,\r
+                       type, pointerEventType,\r
                        touches, events,\r
                        altKey, ctrlKey, metaKey, shiftKey, target, related, force,\r
                        elm, i, n, time, touch, ev;\r
@@ -29,6 +29,19 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                //this._event        = e;\r
                this.type          = type = X_Event_RenameTo[ originalType ] || originalType;\r
                \r
+               switch( type ){\r
+                       case 'message' :\r
+                               this.data   = e.data;\r
+                               this.origin = e.origin;\r
+                               this.source = e.source;\r
+                               break;\r
+                       case 'progress' :\r
+                               this.lengthComputable = e.lengthComputable;\r
+                               this.loaded = e.loaded;\r
+                               this.total  = e.total;\r
+                               break;\r
+               };\r
+               \r
                //console.log( 'original : ' + originalType + ' > ' + type );\r
                // http://msdn.microsoft.com/ja-jp/library/ie/dn304886%28v=vs.85%29.aspx\r
                // ポインター イベントの更新\r
@@ -86,17 +99,17 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                        this.offsetX       = e.offsetX;\r
                        this.offsetY       = e.offsetY;\r
                } else\r
-               if( pointerType = X_Event_toPointer[ originalType ] ){\r
+               if( pointerEventType = X_Event_toPointer[ originalType ] ){\r
                        // Touch or Mouse\r
-                       //console.log( originalType + ' => ' + pointerType );\r
+                       //console.log( originalType + ' => ' + pointerEventType );\r
                        \r
                        /* e.constructor === window.TouchEvent -> e.touches for iOS3.13 */\r
                        if( touches = e.changedTouches ){\r
-                               //console.log( originalType + ' => ' + pointerType );\r
+                               //console.log( originalType + ' => ' + pointerEventType );\r
                                if( touches.length === 0 ){\r
                                        alert( 'e.changedTouches.length === 0' );\r
                                };\r
-                               xnode._cancelMouse = pointerType;\r
+                               xnode._cancelMouse = pointerEventType;\r
                                \r
                                events   = [];\r
                                altKey   = e.altKey;\r
@@ -110,7 +123,7 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                                        target  = touch.target;\r
                                        related = touch.relatedTarget;\r
                                        events[ i ] = {\r
-                                               type          : pointerType,\r
+                                               type          : pointerEventType,\r
                                                pointerType   : 'touch',\r
                                                target        : X_Node_getXNode( target.nodeType === 3 ? target.parentNode : target ),// defeat Safari bug // xnodetouch.target,\r
                                                currentTarget : xnode,\r
@@ -144,14 +157,14 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                                return events.length === 1 ? events[ 0 ] : events;\r
                        } else {\r
                                \r
-                               if( xnode._cancelMouse === pointerType ){\r
+                               if( xnode._cancelMouse === pointerEventType ){\r
                                        delete xnode._cancelMouse;\r
                                        console.log( '**** xnode._cancelMouse ' + xnode._cancelMouse );\r
                                        return [];\r
                                };\r
                                \r
                                // MouseEvent;\r
-                               this.type          = type;\r
+                               this.type          = pointerEventType;\r
                                this.pointerType   = 'mouse';\r
                                \r
                                this.button        = e.button !== undefined ? e.button :\r
@@ -181,7 +194,7 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                                \r
                        // http://www.programming-magic.com/20090127231544/\r
                        // Opera で button==2の場合、コンテキストメニューイベントを発火 「ツール」->「設定」->「詳細設定」->「コンテンツ」->「Javascriptオプション」で「右クリックを制御するスクリプトを許可する」\r
-                               if( originalType === 'mousedown' && this.button === 2 && X_UA.Opera ){\r
+                               if( originalType === 'mousedown' && this.button === 2 && X_UA[ 'Opera' ] ){\r
                                        events = [ X.Object.clone( this ), X.Object.clone( this ) ];\r
                                        events[ 1 ].type = 'contextmenu';\r
                                        return events;\r
@@ -216,7 +229,7 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                                if( e.deltaY !== undefined ){\r
                                        this.deltaX = e.deltaX;\r
                                        this.deltaY = e.deltaY;\r
-                                       this.deltaZ = e.deltaZ;\r
+                                       this.deltaZ = e.deltaZ || 0;\r
                                } else\r
                                if( e.wheelDeltaY !== undefined ){\r
                                        this.deltaX = e.wheelDeltaX / 120;\r
@@ -239,7 +252,6 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                this.currentTarget = xnode; // xnode\r
                this.eventPhase    = e.eventPhase;\r
                this.detail        = e.detail;\r
-               \r
        };\r
 } else {\r
        X.Dom.Event = function( e, xnode, element ){\r
@@ -247,7 +259,7 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                \r
                this.type          = X_Event_RenameTo[ originalType ] || originalType;\r
                this.target        = X_Node_getXNode( e.srcElement ); // xnode\r
-               if( this.target && this.target._xnodeType === 3 ) this.target = this.target.parent; // ie4 の fake Textnode がヒットしていないか？\r
+               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.eventPhase    = e.srcElement === element ? 2: 3;\r
@@ -257,6 +269,19 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                this.ctrlKey       = e.ctrlKey;\r
                this.shiftKey      = e.shiftKey;                \r
 \r
+               \r
+               switch( this.type ){\r
+                       case 'message' :\r
+                               this.data   = e.data;\r
+                               this.origin = e.origin;\r
+                               this.source = e.source;\r
+                               break;\r
+                       case 'progress' :\r
+                               this.loaded = e.loaded;\r
+                               this.total  = e.total;\r
+                               break;\r
+               };\r
+\r
                // http://www.programming-magic.com/20090127231544/\r
                switch( originalType ){\r
                        case 'click'    :\r
@@ -295,7 +320,7 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
                                //event.pageY = DOMAssistant.def(e.pageY)? e.pageY : (event.clientY + (de.scrollTop || b.scrollTop) - (de.clientTop || 0));                                                     \r
                        //};\r
 \r
-                       if( 5 <= X_UA.IE ){\r
+                       if( 5 <= X_UA[ 'IE' ] ){\r
                                this.offsetX       = e.offsetX; // イベントターゲット左上からの座標\r
                                this.offsetY       = e.offsetY;                 \r
                        }// else\r
@@ -316,14 +341,6 @@ if( !X_UA.IE || 9 <= X_UA.IE ){
        };\r
 };\r
 \r
-X.Dom.Event.ANIME_BEFORE_START  = ++X_Event_last;\r
-X.Dom.Event.ANIME_START         = ++X_Event_last;\r
-X.Dom.Event.ANIME               = ++X_Event_last;\r
-X.Dom.Event.ANIME_END           = ++X_Event_last;\r
-X.Dom.Event.ANIME_BEFORE_STOP   = ++X_Event_last; // xnode.stop() のみ、指定時間による停止では呼ばれない\r
-X.Dom.Event.ANIME_STOP          = ++X_Event_last;\r
-\r
-\r
 // TODO load -> readystatechange this.readyState === "loaded" || this.readyState === "complete"\r
 /*\r
 X.Dom.Event._LOAD_FIX_TAGS = {\r
@@ -337,12 +354,12 @@ X.Dom.Event._LOAD_FIX_TAGS = {
 //\r
 if( document.onwheel === undefined ){\r
        // DOMMoseScroll\r
-       if( X_UA.Gecko && window.MouseScrollEvent ){\r
-               if( 2 <= X_UA.Gecko || ( 1.9 <= X_UA.Gecko && 1 <= X_UA.GeckoPatch ) ){ // Gecko 1.9.1+ (firefox3.5+)\r
+       if( X_UA[ 'Gecko' ] && window.MouseScrollEvent ){\r
+               if( 2 <= X_UA[ 'Gecko' ] || ( 1.9 <= X_UA[ 'Gecko' ] && 1 <= X_UA[ 'GeckoPatch' ] ) ){ // Gecko 1.9.1+ (firefox3.5+)\r
                        console.log( 'wheel <= MozMousePixelScroll' );\r
                        X_Event_Rename[ 'wheel' ] = 'MozMousePixelScroll';\r
                } else\r
-               if( 1 <= X_UA.Gecko || ( 0.9 <= X_UA.Gecko && 7 <= X_UA.GeckoPatch ) ){ // Gecko 0.9.7+ (NN6.2+?)\r
+               if( 1 <= X_UA[ 'Gecko' ] || ( 0.9 <= X_UA[ 'Gecko' ] && 7 <= X_UA[ 'GeckoPatch' ] ) ){ // Gecko 0.9.7+ (NN6.2+?)\r
                        console.log( 'wheel <= DOMMouseScroll' );\r
                        X_Event_Rename[ 'wheel' ] = 'DOMMouseScroll';\r
                };\r
@@ -390,11 +407,11 @@ if( window.onwebkittransitionend !== undefined && window.ontransitionend === und
        X_Event_Rename[ 'transitionend' ]      = 'webkitTransitionEnd';\r
 } else\r
 if( window.onotransitionend !== undefined && window.ontransitionend === undefined ){\r
-       if( X_UA.Opera < 12 ){\r
-               console.log( 'transitionend <= oTransitionEnd|ver.' + X_UA.Opera );\r
+       if( X_UA[ 'Opera' ] < 12 ){\r
+               console.log( 'transitionend <= oTransitionEnd|ver.' + X_UA[ 'Opera' ] );\r
                X_Event_Rename[ 'transitionend' ]  = 'oTransitionEnd';\r
        } else {\r
-               console.log( 'transitionend <= otransitionEnd|ver.' + X_UA.Opera );\r
+               console.log( 'transitionend <= otransitionEnd|ver.' + X_UA[ 'Opera' ] );\r
                X_Event_Rename[ 'transitionend' ]  = 'otransitionEnd';\r
        };\r
 } else\r
@@ -426,7 +443,7 @@ if( !navigator.pointerEnabled ){
                X_Event_Rename[ 'pointercancel'   ] = 'mouseleave';//??\r
                \r
                // Opera は ブラウザ設定から右クリックの通知を許可すると mousedown で e.button==2 が返る,ｷｬﾝｾﾙは可能??\r
-               X_UA.Opera && (\r
+               X_UA[ 'Opera' ] && (\r
                X_Event_Rename[ 'contextmenu'     ] = 'mousedown' );\r
                \r
                /*\r