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.125, bugfix X.Node.
[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
3b1c59e
..
3910b6f
100644
(file)
--- a/
0.6.x/js/02_dom/03_XDomEvent.js
+++ b/
0.6.x/js/02_dom/03_XDomEvent.js
@@
-21,7
+21,7
@@
var X_Dom_Event_devicePixelRatio = window.devicePixelRatio || ( window.screen.de
if( !X_UA.IE || 9 <= X_UA.IE ){
\r
X.Dom.Event = function( e, xnode ){
\r
var originalType = e.type,
\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, pointer
Event
Type,
\r
touches, events,
\r
altKey, ctrlKey, metaKey, shiftKey, target, related, force,
\r
elm, i, n, time, touch, ev;
\r
touches, events,
\r
altKey, ctrlKey, metaKey, shiftKey, target, related, force,
\r
elm, i, n, time, touch, ev;
\r
@@
-36,6
+36,7
@@
if( !X_UA.IE || 9 <= X_UA.IE ){
this.source = e.source;
\r
break;
\r
case 'progress' :
\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
this.loaded = e.loaded;
\r
this.total = e.total;
\r
break;
\r
@@
-98,17
+99,17
@@
if( !X_UA.IE || 9 <= X_UA.IE ){
this.offsetX = e.offsetX;
\r
this.offsetY = e.offsetY;
\r
} else
\r
this.offsetX = e.offsetX;
\r
this.offsetY = e.offsetY;
\r
} else
\r
- if( pointerType = X_Event_toPointer[ originalType ] ){
\r
+ if( pointer
Event
Type = X_Event_toPointer[ originalType ] ){
\r
// Touch or Mouse
\r
// Touch or Mouse
\r
- //console.log( originalType + ' => ' + pointerType );
\r
+ //console.log( originalType + ' => ' + pointer
Event
Type );
\r
\r
/* e.constructor === window.TouchEvent -> e.touches for iOS3.13 */
\r
if( touches = e.changedTouches ){
\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 + ' => ' + pointer
Event
Type );
\r
if( touches.length === 0 ){
\r
alert( 'e.changedTouches.length === 0' );
\r
};
\r
if( touches.length === 0 ){
\r
alert( 'e.changedTouches.length === 0' );
\r
};
\r
- xnode._cancelMouse = pointerType;
\r
+ xnode._cancelMouse = pointer
Event
Type;
\r
\r
events = [];
\r
altKey = e.altKey;
\r
\r
events = [];
\r
altKey = e.altKey;
\r
@@
-122,7
+123,7
@@
if( !X_UA.IE || 9 <= X_UA.IE ){
target = touch.target;
\r
related = touch.relatedTarget;
\r
events[ i ] = {
\r
target = touch.target;
\r
related = touch.relatedTarget;
\r
events[ i ] = {
\r
- type : pointerType,
\r
+ type : pointer
Event
Type,
\r
pointerType : 'touch',
\r
target : X_Node_getXNode( target.nodeType === 3 ? target.parentNode : target ),// defeat Safari bug // xnodetouch.target,
\r
currentTarget : xnode,
\r
pointerType : 'touch',
\r
target : X_Node_getXNode( target.nodeType === 3 ? target.parentNode : target ),// defeat Safari bug // xnodetouch.target,
\r
currentTarget : xnode,
\r
@@
-156,14
+157,14
@@
if( !X_UA.IE || 9 <= X_UA.IE ){
return events.length === 1 ? events[ 0 ] : events;
\r
} else {
\r
\r
return events.length === 1 ? events[ 0 ] : events;
\r
} else {
\r
\r
- if( xnode._cancelMouse === pointerType ){
\r
+ if( xnode._cancelMouse === pointer
Event
Type ){
\r
delete xnode._cancelMouse;
\r
console.log( '**** xnode._cancelMouse ' + xnode._cancelMouse );
\r
return [];
\r
};
\r
\r
// MouseEvent;
\r
delete xnode._cancelMouse;
\r
console.log( '**** xnode._cancelMouse ' + xnode._cancelMouse );
\r
return [];
\r
};
\r
\r
// MouseEvent;
\r
- this.type =
t
ype;
\r
+ this.type =
pointerEventT
ype;
\r
this.pointerType = 'mouse';
\r
\r
this.button = e.button !== undefined ? e.button :
\r
this.pointerType = 'mouse';
\r
\r
this.button = e.button !== undefined ? e.button :
\r
@@
-228,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
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
} else
\r
if( e.wheelDeltaY !== undefined ){
\r
this.deltaX = e.wheelDeltaX / 120;
\r
@@
-259,7
+260,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
\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
this.currentTarget = xnode; // xnode
\r
this.relatedTarget = X_Node_getXNode( e.formElement || e.toElement ); // xnode
\r
this.eventPhase = e.srcElement === element ? 2: 3;
\r
@@
-341,14
+342,6
@@
if( !X_UA.IE || 9 <= X_UA.IE ){
};
\r
};
\r
\r
};
\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
// TODO load -> readystatechange this.readyState === "loaded" || this.readyState === "complete"
\r
/*
\r
X.Dom.Event._LOAD_FIX_TAGS = {
\r