Version 0.6.92, bugfix for ie.

[pettanr/clientJs.git] / 0.6.x / js / 01_core / 07_XEventDispatcher.js

diff --git a/0.6.x/js/01_core/07_XEventDispatcher.js b/0.6.x/js/01_core/07_XEventDispatcher.js
index e533736..426a05d 100644 (file)
--- a/0.6.x/js/01_core/07_XEventDispatcher.js
+++ b/0.6.x/js/01_core/07_XEventDispatcher.js
@@ -17,21 +17,6 @@
  * イベントターゲット上にある現在のどのイベントリスナーも指定していない引数付きの removeEventListener は、何の効果もありません。\r
  */\r
 \r
-X.Event = {\r
-       COMPLETE               :  1,\r
-       READY                  :  2,\r
-       SUCCESS                :  3,\r
-       ERROR                  :  4,\r
-       PROGRESS               :  5,\r
-       BEFORE_CANCEL          :  6,\r
-       CANCELED               :  7,\r
-       TIMEOUT                :  8,\r
-       BEFORE_KILL_INSTANCE   :  9,\r
-       KILL_INSTANCE          : 10,\r
-       KILL_INSTANCE_CANCELED : 11,\r
-       _LAST_EVENT            : 11\r
-};\r
-\r
 // ------------------------------------------------------------------------- //\r
 // ------------ local variables -------------------------------------------- //\r
 // ------------------------------------------------------------------------- //\r
@@ -464,7 +449,7 @@ function X_EventDispatcher_unlisten( opt_type, opt_arg1, opt_arg2, opt_arg3 ){
                        raw  = this._rawObject || this._ie4getRawNode && this._ie4getRawNode();\r
                        delete list[ opt_type ];\r
                        if( empty = X.isEmptyObject( list ) ) delete this._listeners;\r
-                       if( raw && '' + parseFloat( opt_type ) !== opt_type ){ // 数字イベントの除外\r
+                       if( raw && '' + parseFloat( opt_type ) !== '' + opt_type ){ // 数字イベントの除外\r
                                X_EventDispatcher_actualRemoveEvent( this, opt_type, raw, _list, !empty );\r
                        };\r
                };\r
@@ -490,7 +475,7 @@ var X_EventDispatcher_actualAddEvent =
                        } else {\r
                                that._handleEvent || ( that._handleEvent = X.Callback.create( that, X_EventDispatcher_actualHandleEvent ) );\r
                                \r
-                               if( that._isSilverLight ){\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
@@ -521,7 +506,7 @@ var X_EventDispatcher_actualAddEvent =
                                } else{\r
                                        that._handleEvent || ( that._handleEvent = X.Callback.create( that, X_EventDispatcher_actualHandleEvent ) );\r
                                        \r
-                                       if( that._isSilverLight ){\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
@@ -544,7 +529,7 @@ var X_EventDispatcher_actualAddEvent =
                        } else {\r
                                that._handleEvent || ( that._handleEvent = X.Callback.create( that, X_EventDispatcher_actualHandleEvent ) );\r
                                \r
-                               if( that._isSilverLight ){\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
@@ -572,7 +557,7 @@ var X_EventDispatcher_actualRemoveEvent =
                                };\r
                        } else {\r
                                \r
-                               if( that._isSilverLight ){\r
+                               if( that._isSilverlight ){\r
                                        raw.RemoveEventListener( type, list.sltoken ); // token\r
                                        X.Callback._correct( list.slcallback );\r
                                        delete list.sltoken;\r
@@ -609,7 +594,7 @@ var X_EventDispatcher_actualRemoveEvent =
                                        };\r
                                } else {\r
                                        \r
-                                       if( that._isSilverLight ){\r
+                                       if( that._isSilverlight ){\r
                                                raw.RemoveEventListener( type, list.sltoken ); // token\r
                                                X.Callback._correct( list.slcallback );\r
                                                delete list.sltoken;\r
@@ -639,7 +624,7 @@ var X_EventDispatcher_actualRemoveEvent =
                                };\r
                        } else {\r
                                \r
-                               if( that._isSilverLight ){\r
+                               if( that._isSilverlight ){\r
                                        raw.RemoveEventListener( type, list.sltoken ); // token\r
                                        X.Callback._correct( list.slcallback );\r
                                        delete list.sltoken;\r