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.221, Update the X.TextRange.
[pettanr/clientJs.git]
/
0.6.x
/
js
/
01_core
/
15_XEventDispatcher.js
diff --git
a/0.6.x/js/01_core/15_XEventDispatcher.js
b/0.6.x/js/01_core/15_XEventDispatcher.js
index
5a9864a
..
afa52c7
100644
(file)
--- a/
0.6.x/js/01_core/15_XEventDispatcher.js
+++ b/
0.6.x/js/01_core/15_XEventDispatcher.js
@@
-733,7
+733,8
@@
function X_EventDispatcher_actualRemoveEvent( that, type, raw, list, skip ){
\r
\r
// TODO ブラウザからの呼び出しの最後に登録された関数を呼び出す機能(例えば画面の更新)
\r
\r
\r
// TODO ブラウザからの呼び出しの最後に登録された関数を呼び出す機能(例えば画面の更新)
\r
-var X_EventDispatcher_CURRENT_EVENTS = [];
\r
+var X_EventDispatcher_CURRENT_EVENTS = [];
\r
+var X_EventDispatcher_ignoreActualEvent = '';
\r
\r
// handleEvent を拡張可能にするために、クロージャに移動した
\r
// Is this in regard to the Safari 1.x preventDefault bug on click/dblclick?
\r
\r
// handleEvent を拡張可能にするために、クロージャに移動した
\r
// Is this in regard to the Safari 1.x preventDefault bug on click/dblclick?
\r
@@
-741,8
+742,16
@@
var X_EventDispatcher_CURRENT_EVENTS = [];
var X_EventDispatcher_actualHandleEvent =
\r
X_UA_EVENT.IE4 || X_UA_EVENT.IE ? // ie45678 EVENT_IE & EVENT_DOM0 for ie4
\r
(function(){
\r
var X_EventDispatcher_actualHandleEvent =
\r
X_UA_EVENT.IE4 || X_UA_EVENT.IE ? // ie45678 EVENT_IE & EVENT_DOM0 for ie4
\r
(function(){
\r
- var e = event, ret,
\r
- ev = new X_DomEvent( e, this, this[ '_rawObject' ] );
\r
+ var e = event,
\r
+ elm = this[ '_rawObject' ],
\r
+ ev, ret;
\r
+
\r
+ /* if( e.type === X_EventDispatcher_ignoreActualEvent ){
\r
+ e.cancelBubble = true;
\r
+ return;
\r
+ }; */
\r
+
\r
+ ev = new X_DomEvent( e, this, elm );
\r
\r
X_EventDispatcher_CURRENT_EVENTS[ X_EventDispatcher_CURRENT_EVENTS.length ] = ev;
\r
\r
\r
X_EventDispatcher_CURRENT_EVENTS[ X_EventDispatcher_CURRENT_EVENTS.length ] = ev;
\r
\r
@@
-754,16
+763,21
@@
var X_EventDispatcher_actualHandleEvent =
e.cancelBubble = true;
\r
};
\r
if( ret & X_CALLBACK_PREVENT_DEFAULT ){
\r
e.cancelBubble = true;
\r
};
\r
if( ret & X_CALLBACK_PREVENT_DEFAULT ){
\r
- this[ '_tag' ] === 'A' &&
this[ '_rawObject' ]
.blur();
\r
+ this[ '_tag' ] === 'A' &&
elm
.blur();
\r
return e.returnValue = false;
\r
};
\r
}) :
\r
//X_UA_EVENT.W3C || X_UA_EVENT.DOM0
\r
(function( e ){
\r
return e.returnValue = false;
\r
};
\r
}) :
\r
//X_UA_EVENT.W3C || X_UA_EVENT.DOM0
\r
(function( e ){
\r
- var ev = new X_DomEvent( e, this ),
\r
- ret = X_CALLBACK_NONE,
\r
- i, l;
\r
+ var ret = X_CALLBACK_NONE,
\r
+ ev, i, l;
\r
+
\r
+ /* if( e.type === X_EventDispatcher_ignoreActualEvent ){
\r
+ e.stopPropagation();
\r
+ return;
\r
+ }; */
\r
\r
\r
+ ev = new X_DomEvent( e, this );
\r
X_EventDispatcher_CURRENT_EVENTS[ X_EventDispatcher_CURRENT_EVENTS.length ] = ev;
\r
\r
// touch event -> pointer
\r
X_EventDispatcher_CURRENT_EVENTS[ X_EventDispatcher_CURRENT_EVENTS.length ] = ev;
\r
\r
// touch event -> pointer
\r