OSDN Git Service

Version 0.6.96. add lock function @X.EventDispatcher.
[pettanr/clientJs.git] / 0.6.x / js / 01_core / 13_XEventDispatcher.js
index 970b3f6..24fea1b 100644 (file)
@@ -21,6 +21,8 @@
 // ------------ local variables -------------------------------------------- //\r
 // ------------------------------------------------------------------------- //\r
 var X_EventDispatcher_once       = false,\r
+       X_EventDispatcher_lock       = false,\r
+       X_EventDispatcher_unlock     = false,\r
        X_EventDispatcher_needsIndex = false,\r
        \r
        X_EventDispatcher_safariPreventDefault = false; // Safari3-\r
@@ -30,7 +32,7 @@ var X_EventDispatcher_once       = false,
 // ------------------------------------------------------------------------- //\r
 \r
 /**\r
- * イベントターゲット(widnow, document, Image, XHR 等)をラップする場合、通常は new 時に渡します。参照:コンストラクタ実体 {@link X.EventDispatcher.Constructor}\r
+ * イベントターゲット(widnow, document, Image, XHR, Silverlight 等)をラップする場合、通常は new 時に渡します。参照:コンストラクタ実体 {@link X.EventDispatcher.Constructor}\r
  * アプリケーション独自のイベントをやり取りしたいだけ、という場合、イベントターゲットは不要です。\r
  * @class\r
  * @classdesc EventTarget オブジェクトをラップしたり、アプリケーションで独自に定義したイベントを発信するためのクラスです。\r
@@ -39,6 +41,8 @@ var X_EventDispatcher_once       = false,
  *     イベントターゲットオブジェクト(widnow, document, HTMLElement, XHR 等)が _rawObject に設定されていた場合に、それらへ実際のイベント登録・解除も行います。\r
  *     このイベントの登録・解除はクロスブラウザで、IE5~8 の独自イベントの差異を吸収し、DOM0 に対しても複数のコールバックを登録することができます。\r
  *     またコールバックに対して、this コンテキストや、追加の引数を指定もできます。 this コンテキストを指定しなかった場合、EventDispatcher インスタンスがコールバックの this になります。 \r
+ *     unlisten() は、引数を指定しなかった場合、全てのイベントを解除します。ただし、systemListen 経由で登録されたハンドラは解除されません。\r
+ *     systemListen, systemUnlisten は、ライブラリ内のコードからしかアクセスできません。\r
  * @param {object=} opt_rawObject\r
  */\r
 X.EventDispatcher =\r
@@ -166,7 +170,7 @@ X.EventDispatcher =
                 * @this {X.EventDispatcher}\r
                 * @return {(number|boolean)}\r
                 * @param {(string|number)=} opt_type\r
-                * @param {(listener|function|Array)=} opt_arg1\r
+                * @param {(listener|function|Array|callbackHash)=} opt_arg1\r
                 * @param {(function|Array=} opt_arg2\r
                 * @param {Array=} opt_arg3\r
                 */                     \r
@@ -192,7 +196,10 @@ X.EventDispatcher =
                                };\r
                                for( i = list.length; i; ){\r
                                        f = list[ --i ];\r
-                                       if( f === hash || ( f.x === hash.x && f.f === hash.f && f.s === hash.s ) ) return X_EventDispatcher_needsIndex ? i : true;\r
+                                       if( f === hash || ( f.x === hash.x && f.f === hash.f && f.s === hash.s ) ){\r
+                                               // index を要求された場合、lock されていない、または unlock なら index を返す\r
+                                               return X_EventDispatcher_needsIndex ? ( X_EventDispatcher_unlock || !f.lock ? i : false ) : true;\r
+                                       };\r
                                };\r
                                return false;\r
                        },\r
@@ -201,10 +208,15 @@ X.EventDispatcher =
                 * delay(ミリ秒)後にイベントを dispatch する。戻り値は uid = X.Timer.add() のタイマーID(数値)。X.Timer.remove(uid) でタイマーを解除して dispatch を中止できる。\r
                 * @this {X.EventDispatcher}\r
                 * @return {number}\r
-                * @param {number=} delay\r
+                * @param {number=} delay ms 省略した場合は 0 として扱う asyncDispatch( 'myevent' ) -> asyncDispatch( 0, 'myevent' )\r
                 * @param {(eventHash|string|number)=} e\r
                 */                     \r
                        asyncDispatch : function( delay, e ){\r
+                               if( delay && e === undefined ){\r
+                                       e = delay;\r
+                                       delay = 0;\r
+                                       console.log( 'lazy : ' + e );\r
+                               };\r
                                return X.Timer.add( delay, 1, this, this.dispatch, [ e ] );\r
                        }\r
                }\r
@@ -249,12 +261,13 @@ function X_EventDispatcher_dispatch( e ){
                };\r
                if( unlistens && unlistens.indexOf( f ) !== -1 ) continue;\r
                \r
-               r = X_Callback_NONE;\r
-               if( f.k ){\r
-                       r = X_Callback_proxyCallback( f, args || ( args = [ e ] ) );\r
-               } else {\r
-                       r = f.call( this, e );\r
-               };\r
+               //if( f !== X.emptyFunction ){\r
+               //      if( f.k ){\r
+                               r = X_Callback_proxyCallback( f, args || ( args = [ e ] ) );\r
+               //      } else {\r
+               //              r = f.call( this, e );\r
+               //      };\r
+               //};\r
                \r
                if( f.once || r & X_Callback_UN_LISTEN ){\r
                        // dispatch 中に unlisten が作られることがある\r
@@ -276,7 +289,8 @@ function X_EventDispatcher_dispatch( e ){
                unlistens = this._unlistens;\r
                delete this._dispatching;\r
                delete this._unlistens;                                 \r
-               \r
+               // _unlistens に入っている callbackHash は、lock をクリアしている\r
+               X_EventDispatcher_unlock = true;\r
                for( type in unlistens ){\r
                        list = unlistens[ type ];\r
                        for( i = list.length; i; ){\r
@@ -285,6 +299,7 @@ function X_EventDispatcher_dispatch( e ){
                        list.length = 0;\r
                        delete unlistens[ type ];\r
                };\r
+               X_EventDispatcher_unlock = false;\r
                \r
                if( this._killReserved ){\r
                        this.kill();\r
@@ -293,8 +308,10 @@ function X_EventDispatcher_dispatch( e ){
                        for( i = 0, l = list.length; i < l; ++i ){\r
                                f = list[ i ];\r
                                X_EventDispatcher_once = f[ 4 ];\r
+                               X_EventDispatcher_lock = f[ 5 ];\r
                                this.listen( f[ 0 ], f[ 1 ], f[ 2 ], f[ 3 ] );\r
                                X_EventDispatcher_once = false;\r
+                               X_EventDispatcher_lock = false;\r
                                f.length = 0;\r
                        };\r
                        list.length = 0;\r
@@ -320,7 +337,7 @@ function X_EventDispatcher_listen( type, opt_arg1, opt_arg2, opt_arg3 ){
        \r
        if( this._dispatching ){\r
                if( !this._reserves ) this._reserves = [];\r
-               this._reserves[ this._reserves.length ] = [ type, opt_arg1, opt_arg2, opt_arg3, X_EventDispatcher_once ];\r
+               this._reserves[ this._reserves.length ] = [ type, opt_arg1, opt_arg2, opt_arg3, X_EventDispatcher_once, X_EventDispatcher_lock ];\r
                return this;\r
        };\r
        \r
@@ -339,15 +356,25 @@ function X_EventDispatcher_listen( type, opt_arg1, opt_arg2, opt_arg3 ){
        if( !list ) list = this._listeners = {};\r
        if( !( list = list[ type ] ) ) list = this._listeners[ type ] = [];\r
        \r
-       add && X_EventDispatcher_actualAddEvent( this, type, raw, list );\r
+       add && X_EventDispatcher_addEvent( this, type, raw, list );\r
        \r
        f = X_Callback_classifyCallbackArgs( opt_arg1, opt_arg2, opt_arg3, this );\r
        list[ list.length ] = f;\r
        f.once = X_EventDispatcher_once;\r
+       f.lock = X_EventDispatcher_lock;\r
        \r
        return this;\r
 };\r
 \r
+/*\r
+ * X_EventDispatcher_systemUnlisten 経由でないと解除できないリスナの登録\r
+ */\r
+function X_EventDispatcher_systemListen( that, type, opt_arg1, opt_arg2, opt_arg3 ){\r
+       X_EventDispatcher_lock = true;\r
+       that.listen( type, opt_arg1, opt_arg2, opt_arg3 );\r
+       X_EventDispatcher_lock = false;\r
+};\r
+\r
 /**\r
  * \r
  * @this {X.EventDispatcher}\r
@@ -409,26 +436,48 @@ function X_EventDispatcher_unlisten( opt_type, opt_arg1, opt_arg2, opt_arg3 ){
        if( i === false ) return this;\r
 \r
        f = ( _list = list[ opt_type ] )[ i ];\r
+       // _unlistens に入っている callbackHash は、lock をクリアしている\r
        if( unlistens = this._unlistens ){\r
                ( unlistens = unlistens[ opt_type ] ) ?\r
                        ( unlistens[ unlistens.length ] = f ) :\r
                        ( this._unlistens[ opt_type ] = [ f ] );\r
        } else {\r
                delete f.once;\r
-               // f.kill === X_Callback_kill && f.kill();\r
                _list.splice( i, 1 );\r
                if( !_list.length ){\r
                        raw  = this._rawObject || this._ie4getRawNode && this._ie4getRawNode();\r
                        delete list[ opt_type ];\r
                        if( empty = X_Object_isEmpty( list ) ) delete this._listeners;\r
                        if( raw && '' + parseFloat( opt_type ) !== '' + opt_type ){ // 数字イベントの除外\r
-                               X_EventDispatcher_actualRemoveEvent( this, opt_type, raw, _list, !empty );\r
+                               X_EventDispatcher_removeEvent( this, opt_type, raw, _list, !empty );\r
                        };\r
                };\r
        };\r
        return this;\r
 };\r
 \r
+/*\r
+ * X_EventDispatcher_systemListen から登録したイベントの解除\r
+ */\r
+function X_EventDispatcher_systemUnlisten( that, type, opt_arg1, opt_arg2, opt_arg3 ){\r
+       X_EventDispatcher_unlock = true;\r
+       that.unlisten( type, opt_arg1, opt_arg2, opt_arg3 );\r
+       X_EventDispatcher_unlock = false;\r
+};\r
+\r
+function X_EventDispatcher_addEvent( that, type, raw, list ){\r
+       var i;\r
+       X_EventDispatcher_lock || ( type = X_Event_Rename[ type ] || type );\r
+       \r
+       if( X.Type.isArray( type ) ){\r
+               for( i = type.length; i; ){\r
+                       X_EventDispatcher_systemListen( that, type[ --i ], X.emptyFunction );\r
+                       console.log( 'X_EventDispatcher_systemListen ' + type[ i ] );\r
+               };\r
+       } else {\r
+               X_EventDispatcher_actualAddEvent( that, type, raw, list );\r
+       };\r
+};\r
 \r
 var X_EventDispatcher_actualAddEvent =\r
        // Days on the Moon DOM Events とブラウザの実装 \r
@@ -436,78 +485,55 @@ var X_EventDispatcher_actualAddEvent =
        // Safari 2 では関数オブジェクトしか EventListener として使えませんが、Safari のナイトリービルドでは handleEvent メソッドを持つオブジェクトも EventListener として使えるようです。\r
        X_UA_EVENT.W3C /* && ( X.UA.WebKit < 525.13 || X.UA.Opera7 || X.UA.NetFront < 4 ) */ ? // Safari3-\r
                (function( that, type, raw, list ){\r
-                       var i;\r
-                       \r
-                       type = X.Dom.Event.Rename[ type ] || type;\r
-                       \r
-                       if( X.Type.isArray( type ) ){\r
-                               for( i = type.length; i; ){\r
-                                       X_EventDispatcher_actualAddEvent( that, type[ --i ], raw, list );\r
-                               };\r
-                       } else {\r
+                       if( that._isXHR && X.UA.Opera < 12 ){\r
+                               // Opera11- の XHR は event オブジェクトが返らないため, eventType 毎に callback を指定する addEventListener もない\r
+                               raw[ 'on' + type ] = X_Callback_create( that, X_EventDispatcher_dispatch, [ type ] );\r
+                       } else\r
+                       if( that._isSilverlight ){\r
+                               list.slcallback = X_Callback_create( that, X_EventDispatcher_sliverLightDispatch, [ type ] );\r
+                               list.sltoken    = raw.AddEventListener( type, list.slcallback );\r
+                       } else {                \r
                                that._handleEvent || ( that._handleEvent = X_Callback_create( that, X_EventDispatcher_actualHandleEvent ) );\r
-                               \r
-                               if( that._isSilverlight ){\r
-                                       list.slcallback = X_Callback_create( that, X_EventDispatcher_sliverLightDispatch, [ type ] );\r
-                                       list.sltoken    = raw.AddEventListener( type, list.slcallback );\r
-                               } else\r
+\r
                                if( raw.addEventListener ){\r
                                        raw.addEventListener( type, that._handleEvent, false );\r
                                } else {\r
                                        // Safari は Image, Opera7 は window\r
                                        raw[ 'on' + type ] = that._handleEvent;\r
-                               };                              \r
+                               };\r
                        };\r
                }) :\r
        X_UA_EVENT.IE ?\r
                (function( that, type, raw, list ){\r
-                       var i;\r
-                       //if( type === 'load' && that._tag && X.Dom.Event._LOAD_FIX_TAGS[ that._tag ] ){\r
-                       //      type = 'readystatechange';\r
-                       //};\r
                        if( that._isXHR ){\r
                                // ie8- の XHR は window.event が更新されないため, eventType 毎に callback を指定する\r
                                raw[ 'on' + type ] = X_Callback_create( that, X_EventDispatcher_dispatch, [ type ] );\r
-                       } else {\r
-                               type = X.Dom.Event.Rename[ type ] || type;\r
-                               \r
-                               if( X.Type.isArray( type ) ){\r
-                                       for( i = type.length; i; ){\r
-                                               X_EventDispatcher_actualAddEvent( that, type[ --i ], raw, list );\r
-                                       };\r
-                               } else{\r
-                                       that._handleEvent || ( that._handleEvent = X_Callback_create( that, X_EventDispatcher_actualHandleEvent ) );\r
-                                       \r
-                                       if( that._isSilverlight ){\r
-                                               list.slcallback = X_Callback_create( that, X_EventDispatcher_sliverLightDispatch, [ type ] );\r
-                                               list.sltoken    = raw.AddEventListener( type, list.slcallback );\r
-                                       } else\r
-                                       if( raw.attachEvent ){\r
-                                               raw.attachEvent( 'on' + type, that._handleEvent );\r
-                                       } else {\r
-                                               raw[ 'on' + type ] = that._handleEvent;\r
-                                       };\r
-                               };                              \r
-                       };\r
-               }) :\r
-               (function( that, type, raw, list ){\r
-                       var i;\r
-                       type = X.Dom.Event.Rename[ type ] || type;\r
-                       \r
-                       if( X.Type.isArray( type ) ){\r
-                               for( i = type.length; i; ){\r
-                                       X_EventDispatcher_actualAddEvent( that, type[ --i ], raw, list );\r
-                               };\r
-                       } else {\r
+                       } else                                  \r
+                       if( that._isSilverlight ){\r
+                               list.slcallback = X_Callback_create( that, X_EventDispatcher_sliverLightDispatch, [ type ] );\r
+                               list.sltoken    = raw.AddEventListener( type, list.slcallback );\r
+                       } else {                                \r
                                that._handleEvent || ( that._handleEvent = X_Callback_create( that, X_EventDispatcher_actualHandleEvent ) );\r
                                \r
-                               if( that._isSilverlight ){\r
-                                       list.slcallback = X_Callback_create( that, X_EventDispatcher_sliverLightDispatch, [ type ] );\r
-                                       list.sltoken    = raw.AddEventListener( type, list.slcallback );\r
+                               if( raw.attachEvent ){\r
+                                       raw.attachEvent( 'on' + type, that._handleEvent );\r
                                } else {\r
                                        raw[ 'on' + type ] = that._handleEvent;\r
                                };\r
                        };\r
+               }) :\r
+               (function( that, type, raw, list ){\r
+                       if( that._isXHR ){\r
+                               // ie4 mobile は XHR をサポート!\r
+                               raw[ 'on' + type ] = X_Callback_create( that, X_EventDispatcher_dispatch, [ type ] );\r
+                       } else\r
+                       if( that._isSilverlight ){\r
+                               // DOM0 で Silverlight ってあるの?\r
+                               list.slcallback = X_Callback_create( that, X_EventDispatcher_sliverLightDispatch, [ type ] );\r
+                               list.sltoken    = raw.AddEventListener( type, list.slcallback );\r
+                       } else {\r
+                               raw[ 'on' + type ] = that._handleEvent || ( that._handleEvent = X_Callback_create( that, X_EventDispatcher_actualHandleEvent ) );\r
+                       };\r
                });\r
 \r
 /*\r
@@ -518,97 +544,87 @@ function X_EventDispatcher_sliverLightDispatch( sender, e, type ){
        return this.dispatch( type );\r
 };\r
 \r
+function X_EventDispatcher_removeEvent( that, type, raw, list, skip ){\r
+       var i;\r
+       X_EventDispatcher_unlock || ( type = X_Event_Rename[ type ] || type );\r
+       \r
+       if( X.Type.isArray( type ) ){\r
+               for( i = type.length; i; ){\r
+                       X_EventDispatcher_systemUnlisten( that, type[ --i ], X.emptyFunction );\r
+               };\r
+       } else {\r
+               X_EventDispatcher_actualRemoveEvent( that, type, raw, list, skip );\r
+       };\r
+};\r
+\r
 var X_EventDispatcher_actualRemoveEvent =\r
        X_UA_EVENT.W3C /*&& ( X.UA.WebKit < 525.13 || X.UA.Opera7 || X.UA.NetFront < 4 )*/ ? // Safari3-\r
                (function( that, type, raw, list, skip ){\r
-                       type = X.Dom.Event.Rename[ type ] || type;\r
-                       \r
-                       if( X.Type.isArray( type ) ){\r
-                               for( i = type.length; i; ){\r
-                                       X_EventDispatcher_actualRemoveEvent( that, type[ --i ], raw, list, i ? true : skip );\r
-                               };\r
+                       if( that._isXHR && X.UA.Opera < 12 ){\r
+                               X_Callback_correct( raw[ 'on' + type ] );\r
+                               raw[ 'on' + type ] = '';\r
+                       } else  \r
+                       if( that._isSilverlight ){\r
+                               raw.RemoveEventListener( type, list.sltoken ); // token\r
+                               X_Callback_correct( list.slcallback );\r
+                               delete list.sltoken;\r
+                               delete list.slcallback;\r
                        } else {\r
-                               \r
-                               if( that._isSilverlight ){\r
-                                       raw.RemoveEventListener( type, list.sltoken ); // token\r
-                                       X_Callback_correct( list.slcallback );\r
-                                       delete list.sltoken;\r
-                                       delete list.slcallback;\r
+                               if( raw.addEventListener ){\r
+                                       raw.removeEventListener( type, that._handleEvent, false );\r
                                } else {\r
-                                       if( raw.addEventListener ){\r
-                                               raw.removeEventListener( type, that._handleEvent, false );\r
-                                       } else {\r
-                                               raw[ 'on' + type ] = null;\r
-                                       };\r
-                                       if( !skip ){\r
-                                               X_Callback_correct( that._handleEvent );\r
-                                               delete that._handleEvent;\r
-                                       };                                      \r
+                                       raw[ 'on' + type ] = null;\r
+                               };\r
+                               if( !skip ){\r
+                                       X_Callback_correct( that._handleEvent );\r
+                                       delete that._handleEvent;\r
                                };\r
                        };\r
                }) :\r
        X_UA_EVENT.IE ?\r
                (function( that, type, raw, list, skip ){\r
-                       var i;\r
-                       //if( type === 'load' && that._tag && X.Dom.Event._LOAD_FIX_TAGS[ that._tag ] ){\r
-                       //      type = 'readystatechange';\r
-                       //};\r
                        if( that._isXHR ){\r
                                X_Callback_correct( raw[ 'on' + type ] );\r
                                raw[ 'on' + type ] = X.emptyFunction;\r
                                raw[ 'on' + type ] = '';\r
+                       } else  \r
+                       if( that._isSilverlight ){\r
+                               raw.RemoveEventListener( type, list.sltoken ); // token\r
+                               X_Callback_correct( list.slcallback );\r
+                               delete list.sltoken;\r
+                               delete list.slcallback;\r
                        } else {\r
-                               type = X.Dom.Event.Rename[ type ] || type;\r
-                               \r
-                               if( X.Type.isArray( type ) ){\r
-                                       for( i = type.length; i; ){\r
-                                               X_EventDispatcher_actualRemoveEvent( that, type[ --i ], raw, list, i ? true : skip );\r
-                                       };\r
+                               if( raw.attachEvent ){\r
+                                       raw.detachEvent( 'on' + type, that._handleEvent );\r
                                } else {\r
-                                       \r
-                                       if( that._isSilverlight ){\r
-                                               raw.RemoveEventListener( type, list.sltoken ); // token\r
-                                               X_Callback_correct( list.slcallback );\r
-                                               delete list.sltoken;\r
-                                               delete list.slcallback;\r
-                                       } else {\r
-                                               if( raw.attachEvent ){\r
-                                                       raw.detachEvent( 'on' + type, that._handleEvent );\r
-                                               } else {\r
-                                                       raw[ 'on' + type ] = X.emptyFunction;\r
-                                                       raw[ 'on' + type ] = '';\r
-                                               };\r
-                                               \r
-                                               if( !skip ){\r
-                                                       X_Callback_correct( that._handleEvent );\r
-                                                       delete that._handleEvent;\r
-                                               };                                              \r
-                                       };\r
+                                       raw[ 'on' + type ] = X.emptyFunction;\r
+                                       raw[ 'on' + type ] = '';\r
+                               };\r
+                               \r
+                               if( !skip ){\r
+                                       X_Callback_correct( that._handleEvent );\r
+                                       delete that._handleEvent;\r
                                };\r
                        };\r
                }) :\r
                (function( that, type, raw, list, skip ){\r
-                       var i;\r
-                       type = X.Dom.Event.Rename[ type ] || type;\r
-                       if( X.Type.isArray( type ) ){\r
-                               for( i = type.length; i; ){\r
-                                       X_EventDispatcher_actualRemoveEvent( that, type[ --i ], raw, list, i ? true : skip );\r
-                               };\r
+                       if( that._isXHR ){\r
+                               X_Callback_correct( raw[ 'on' + type ] );\r
+                               raw[ 'on' + type ] = X.emptyFunction;\r
+                               raw[ 'on' + type ] = '';\r
+                       } else\r
+                       if( that._isSilverlight ){\r
+                               raw.RemoveEventListener( type, list.sltoken ); // token\r
+                               X_Callback_correct( list.slcallback );\r
+                               delete list.sltoken;\r
+                               delete list.slcallback;\r
                        } else {\r
+                               raw[ 'on' + type ] = X.emptyFunction;\r
+                               raw[ 'on' + type ] = '';\r
                                \r
-                               if( that._isSilverlight ){\r
-                                       raw.RemoveEventListener( type, list.sltoken ); // token\r
-                                       X_Callback_correct( list.slcallback );\r
-                                       delete list.sltoken;\r
-                                       delete list.slcallback;\r
-                               } else {\r
-                                       raw[ 'on' + type ] = X.emptyFunction;\r
-                                       raw[ 'on' + type ] = '';\r
-                                       \r
-                                       if( !skip ){\r
-                                               X_Callback_correct( that._handleEvent );\r
-                                               delete that._handleEvent;\r
-                                       };                                      \r
+                               if( !skip ){\r
+                                       X_Callback_correct( that._handleEvent );\r
+                                       delete that._handleEvent;\r
                                };\r
                        };\r
                });\r
@@ -641,7 +657,7 @@ var X_EventDispatcher_actualHandleEvent =
                        var ev  = new X.Dom.Event( e, this ),\r
                                ret = X_Callback_NONE,\r
                                i, l;\r
-                       \r
+                       console.log( '>>>>>>>>>> ' + e.type );\r
                        // touch event -> pointer\r
                        if( X.Type.isArray( ev ) ){\r
                                if( ev.length === 0 ){\r
@@ -649,6 +665,7 @@ var X_EventDispatcher_actualHandleEvent =
                                        ret = X.Callback.STOP_PROPAGATION | X.Callback.PREVENT_DEFAULT;\r
                                } else {\r
                                        for( i = 0, l = ev.length; i < l; ++i ){\r
+                                               console.log( 'handleEvent ' + ev[ i ].type );\r
                                                ret |= this.dispatch( ev[ i ] ) || 0;\r
                                        };                              \r
                                };\r
@@ -687,12 +704,13 @@ if( X.UA.WebKit < 525.13 ){ // Safari3-
 function X_EventDispatcher_toggleAllEvents( that, add ){\r
        var list = that._listeners,\r
                raw  = that._rawObject || that._ie4getRawNode && that._ie4getRawNode(),\r
-               f    = add ? X_EventDispatcher_actualAddEvent : X_EventDispatcher_actualRemoveEvent,\r
+               f    = add ? X_EventDispatcher_addEvent : X_EventDispatcher_removeEvent,\r
                type;\r
        if( !list || !raw ) return;\r
        for( type in list ){\r
                // 数字イベントの除外\r
                if( '' + parseFloat( type ) !== type ){\r
+                       // TODO type rename はここ\r
                        f( that, type, raw, list[ type ], true );\r
                };\r
        };\r