Version 0.6.157, add X.Net.Form & fix X.EventDispatcher.

[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 e427160..9094791 100644 (file)
--- a/0.6.x/js/01_core/10_XCallback.js
+++ b/0.6.x/js/01_core/10_XCallback.js
@@ -18,6 +18,8 @@ var
        X_Callback_HANDLEEVENT      = 2,\r
        /** @const */\r
        X_Callback_FUNC_ONLY        = 3,\r
+       /** @const */\r
+       X_Callback_THIS_FUNCNAME    = 4,\r
 \r
        /** @const */\r
        X_Callback_NONE             =  0,\r
@@ -177,6 +179,7 @@ function X_Callback_create( thisObject, opt_callback, opt_args /* [ listener ||
                _obj = ret( X_Closure_COMMAND_BACK );\r
                \r
                _obj.kind       = obj.kind;\r
+               _obj.name       = obj.name;\r
                _obj.func       = obj.func;\r
                _obj.context    = obj.context;\r
                _obj.supplement = obj.supplement;\r
@@ -193,12 +196,16 @@ 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( X_Type_isObject( arg1 ) && X_Type_isFunction( arg2 ) ){\r
                obj  = { context : arg1, func : arg2, kind : X_Callback_THIS_FUNC };\r
        } else\r
-       if( arg1 && X_Type_isFunction( arg1[ 'handleEvent' ] ) ){\r
-               obj  = { context : arg1, kind : X_Callback_HANDLEEVENT };\r
-               arg3 = arg2;\r
+       if( X_Type_isObject( arg1 ) ){\r
+               if( arg2 && X_Type_isString( arg2 ) ){\r
+                       obj  = { context : arg1, name : arg2, kind : X_Callback_THIS_FUNCNAME };\r
+               } else {\r
+                       obj  = { context : arg1, kind : X_Callback_HANDLEEVENT };\r
+                       arg3 = arg2;                    \r
+               };\r
        } else\r
        if( X_Type_isFunction( arg1 ) ){\r
                arg3 = arg2;\r
@@ -216,6 +223,10 @@ function X_Callback_classifyCallbackArgs( arg1, arg2, arg3, alt_context ){
                        obj  = { func : arg2, kind : X_Callback_FUNC_ONLY };\r
                };\r
        } else\r
+       if( alt_context && X_Type_isString( arg1 ) ){\r
+               arg3 = arg2;\r
+               obj  = { context : alt_context, name : arg1, kind : X_Callback_THIS_FUNCNAME };\r
+       } else\r
        if( alt_context ){\r
                obj  = { context : alt_context, kind : X_Callback_HANDLEEVENT };\r
                arg3 = arg1;\r
@@ -243,7 +254,7 @@ function X_Callback_proxyCallback( xfunc, _args ){
                thisObj = xfunc.context,\r
                func    = xfunc.func,\r
                supp    = xfunc.supplement,\r
-               temp, ret;      \r
+               temp, ret, funcName;    \r
        \r
        if( supp && supp.length ){\r
                temp = [];\r
@@ -263,9 +274,12 @@ function X_Callback_proxyCallback( xfunc, _args ){
 \r
                case X_Callback_THIS_FUNC :\r
                        return args.length === 0 ? func.call( thisObj ) : func.apply( thisObj, args );\r
-                       \r
+               \r
+               case X_Callback_THIS_FUNCNAME :\r
+                       funcName = xfunc.name;\r
                case X_Callback_HANDLEEVENT :\r
-                       temp = thisObj[ 'handleEvent' ];\r
+                       funcName = funcName || 'handleEvent';\r
+                       temp = thisObj[ funcName ];\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
@@ -298,6 +312,7 @@ function X_Callback_correct( f ){
                X_Callback_POOL_LIST[ X_Callback_POOL_LIST.length ] = f;\r
                obj = f( X_Closure_COMMAND_BACK );\r
                delete obj.kind;\r
+               if( obj.name ) delete obj.name;\r
                if( obj.func ) delete obj.func;\r
                if( obj.context ) delete obj.context;\r
                if( obj.supplement ) delete obj.supplement;\r