OSDN Git Service
(root)
/
pettanr
/
clientJs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
e77dbef
..
16ab951
100644
(file)
--- a/
0.6.x/js/02_dom/03_XDomEvent.js
+++ b/
0.6.x/js/02_dom/03_XDomEvent.js
@@
-18,7
+18,7
@@
var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.de
'4' : 'mouse'
\r
}; */
\r
\r
'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, pointerEventType,
\r
X.Dom.Event = function( e, xnode ){
\r
var originalType = e.type,
\r
type, pointerEventType,
\r
@@
-194,7
+194,7
@@
if( !X_UA.IE || 9 <= X_UA.IE ){
\r
// http://www.programming-magic.com/20090127231544/
\r
// Opera で button==2の場合、コンテキストメニューイベントを発火 「ツール」->「設定」->「詳細設定」->「コンテンツ」->「Javascriptオプション」で「右クリックを制御するスクリプトを許可する」
\r
\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
events = [ X.Object.clone( this ), X.Object.clone( this ) ];
\r
events[ 1 ].type = 'contextmenu';
\r
return events;
\r
@@
-320,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
//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
this.offsetX = e.offsetX; // イベントターゲット左上からの座標
\r
this.offsetY = e.offsetY;
\r
}// else
\r
@@
-354,12
+354,12
@@
X.Dom.Event._LOAD_FIX_TAGS = {
//
\r
if( document.onwheel === undefined ){
\r
// DOMMoseScroll
\r
//
\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
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
console.log( 'wheel <= DOMMouseScroll' );
\r
X_Event_Rename[ 'wheel' ] = 'DOMMouseScroll';
\r
};
\r
@@
-407,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
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
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
X_Event_Rename[ 'transitionend' ] = 'otransitionEnd';
\r
};
\r
} else
\r
@@
-443,7
+443,7
@@
if( !navigator.pointerEnabled ){
X_Event_Rename[ 'pointercancel' ] = 'mouseleave';//??
\r
\r
// Opera は ブラウザ設定から右クリックの通知を許可すると mousedown で e.button==2 が返る,キャンセルは可能??
\r
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
X_Event_Rename[ 'contextmenu' ] = 'mousedown' );
\r
\r
/*
\r