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.204, bug fixes X.UA, update X.Util.Window.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
01_core
/
14_XEvent.js
diff --git
a/0.6.x/js/01_core/14_XEvent.js
b/0.6.x/js/01_core/14_XEvent.js
index
e54199b
..
fa236ac
100644
(file)
--- a/
0.6.x/js/01_core/14_XEvent.js
+++ b/
0.6.x/js/01_core/14_XEvent.js
@@
-12,8
+12,8
@@
var X_Event_Rename = {},
IFRAMEload_proxy : function( e ){
\r
var raw = this[ '_rawObject' ];
\r
\r
IFRAMEload_proxy : function( e ){
\r
var raw = this[ '_rawObject' ];
\r
\r
- return
raw.readyState === 'complete' || raw.readyState === 'loaded'
?
\r
- this[ 'dispatch' ]( 'load' ) : X_CALLBACK_PREVENT_DEFAULT
,
X_CALLBACK_STOP_PROPAGATION;
\r
+ return
( raw.readyState === 'complete' || raw.readyState === 'loaded' )
?
\r
+ this[ 'dispatch' ]( 'load' ) : X_CALLBACK_PREVENT_DEFAULT
|
X_CALLBACK_STOP_PROPAGATION;
\r
},
\r
\r
// X_UA[ 'Opera' ]
\r
},
\r
\r
// X_UA[ 'Opera' ]
\r
@@
-34,6
+34,9
@@
var X_Event_Rename = {},
'mouseup' : 'pointerup',
\r
'touchmove' : 'pointermove',
\r
'mousemove' : 'pointermove',
\r
'mouseup' : 'pointerup',
\r
'touchmove' : 'pointermove',
\r
'mousemove' : 'pointermove',
\r
+ 'touchleave' : 'pointerleave',
\r
+ 'mouseout' : 'pointerout',
\r
+ 'mouseleave' : 'pointerleave',
\r
'touchcancel' : 'pointercancel',
\r
'contextmenu' : 'contextmenu',
\r
'dbclick' : 'dbclick',
\r
'touchcancel' : 'pointercancel',
\r
'contextmenu' : 'contextmenu',
\r
'dbclick' : 'dbclick',
\r
@@
-43,6
+46,8
@@
var X_Event_Rename = {},
'mousedown' : 'pointerdown',
\r
'mouseup' : 'pointerup',
\r
'mousemove' : 'pointermove',
\r
'mousedown' : 'pointerdown',
\r
'mouseup' : 'pointerup',
\r
'mousemove' : 'pointermove',
\r
+ 'mouseout' : 'pointerout',
\r
+ 'mouseleave' : 'pointerleave',
\r
'contextmenu' : 'contextmenu',
\r
'dbclick' : 'dbclick',
\r
'click' : 'click'
\r
'contextmenu' : 'contextmenu',
\r
'dbclick' : 'dbclick',
\r
'click' : 'click'
\r
@@
-107,10
+112,13
@@
var // 内部イベント
X_EVENT_MEDIA_ENDED = 46,
\r
X_EVENT_MEDIA_WAITING = 47,
\r
X_EVENT_MEDIA_SEEKING = 48,
\r
X_EVENT_MEDIA_ENDED = 46,
\r
X_EVENT_MEDIA_WAITING = 47,
\r
X_EVENT_MEDIA_SEEKING = 48,
\r
+ X_EVENT_MEDIA_TOUCH_FOR_LOAD = 49,
\r
\r
\r
- X_EVENT_NEED_AUTH =
49
,
\r
+ X_EVENT_NEED_AUTH =
50
,
\r
\r
\r
- X_Event_last = 49;
\r
+ X_EVENT_DEBUG = 51,
\r
+
\r
+ X_Event_last = 51;
\r
\r
// in_page_jump
\r
// on_screen_keyboard_show
\r
\r
// in_page_jump
\r
// on_screen_keyboard_show
\r
@@
-220,8
+228,11
@@
X[ 'Event' ] = /** @lends X.Event */
'MEDIA_ENDED' : X_EVENT_MEDIA_ENDED,
\r
'MEDIA_WAITING' : X_EVENT_MEDIA_WAITING,
\r
'MEDIA_SEEKING' : X_EVENT_MEDIA_SEEKING,
\r
'MEDIA_ENDED' : X_EVENT_MEDIA_ENDED,
\r
'MEDIA_WAITING' : X_EVENT_MEDIA_WAITING,
\r
'MEDIA_SEEKING' : X_EVENT_MEDIA_SEEKING,
\r
+ 'MEDIA_TOUCH_FOR_LOAD' : X_EVENT_MEDIA_TOUCH_FOR_LOAD,
\r
+
\r
+ 'NEED_AUTH' : X_EVENT_NEED_AUTH,
\r
\r
\r
- '
NEED_AUTH' : X_EVENT_NEED_AUTH
\r
+ '
DEBUG' : X_EVENT_DEBUG
\r
};
\r
\r
X_TEMP.onSystemReady.push(
\r
};
\r
\r
X_TEMP.onSystemReady.push(
\r