Version 0.6.133, fix for closure compiler - ADVANCED_OPTIMIZATIONS

[pettanr/clientJs.git] / 0.6.x / js / 01_core / 10_XCallback.js

diff --git a/0.6.x/js/01_core/10_XCallback.js b/0.6.x/js/01_core/10_XCallback.js
index f042a01..189ba59 100644 (file)
--- a/0.6.x/js/01_core/10_XCallback.js
+++ b/0.6.x/js/01_core/10_XCallback.js
@@ -168,14 +168,14 @@ function X_Callback_create( thisObject, opt_callback, opt_args /* [ listener ||
 function X_Callback_classifyCallbackArgs( arg1, arg2, arg3, alt_context ){\r
        var obj;\r
        \r
-       if( arg1 && X.Type.isFunction( arg2 ) ){\r
+       if( arg1 && X_Type_isFunction( arg2 ) ){\r
                obj  = { x : arg1, f : arg2, k : X_Callback_THIS_FUNC };\r
        } else\r
-       if( arg1 && X.Type.isFunction( arg1[ 'handleEvent' ] ) ){\r
+       if( arg1 && X_Type_isFunction( arg1[ 'handleEvent' ] ) ){\r
                obj  = { x : arg1, k : X_Callback_HANDLEEVENT };\r
                arg3 = arg2;\r
        } else\r
-       if( X.Type.isFunction( arg1 ) ){\r
+       if( X_Type_isFunction( arg1 ) ){\r
                arg3 = arg2;\r
                if( alt_context ){\r
                        obj  = { x : alt_context, f : arg1, k : X_Callback_THIS_FUNC };\r
@@ -183,7 +183,7 @@ function X_Callback_classifyCallbackArgs( arg1, arg2, arg3, alt_context ){
                        obj  = { f : arg1, k : X_Callback_FUNC_ONLY };\r
                };\r
        } else\r
-       if( X.Type.isFunction( arg2 ) ){\r
+       if( X_Type_isFunction( arg2 ) ){\r
                //console.log( 'X_Callback_classifyCallbackArgs : arg1 が ' + arg1 + 'です' ); ie4 で error\r
                if( alt_context ){\r
                        obj  = { x : alt_context, f : arg2, k : X_Callback_THIS_FUNC };\r
@@ -200,7 +200,7 @@ function X_Callback_classifyCallbackArgs( arg1, arg2, arg3, alt_context ){
                return;\r
        };\r
        \r
-       if( X.Type.isArray( arg3 )){\r
+       if( X_Type_isArray( arg3 )){\r
                obj.s = arg3;\r
        };\r
        return ( obj.x || obj.s ) ? obj : arg1;\r
@@ -241,16 +241,16 @@ function X_Callback_proxyCallback( xfunc, _args ){
                        \r
                case X_Callback_HANDLEEVENT :\r
                        temp = thisObj[ 'handleEvent' ];\r
-                       if( X.Type.isFunction( temp ) ){\r
+                       if( X_Type_isFunction( temp ) ){\r
                                return args.length === 0 ? thisObj[ 'handleEvent' ]() :\r
                                           args.length === 1 ? thisObj[ 'handleEvent' ]( args[ 0 ] ) : temp.apply( thisObj, args );\r
                        };\r
                        break;\r
                        /*\r
-                       if( temp !== func && X.Type.isFunction( temp ) ){\r
+                       if( temp !== func && X_Type_isFunction( temp ) ){\r
                                return args.length === 0 ? thisObj[ 'handleEvent' ]() : temp.apply( thisObj, args );\r
                        } else\r
-                       if( X.Type.isFunction( thisObj ) ){\r
+                       if( X_Type_isFunction( thisObj ) ){\r
                                return args.length === 0 ? thisObj.call( thisObj ) : thisObj.apply( thisObj, args );\r
                        };\r
                        return args.length === 0 ? func.call( thisObj ) : func.apply( thisObj, args );*/\r