X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F13_XClass.js;h=a0b15cc797cedaa73579b0b9a6e47990fd7d5fae;hb=2bea17ee282c2cf4ce0de6685db3ade602f6e60f;hp=f0dc784ec345cc601eb9d13fcab82b3a304bcb92;hpb=a720658bd6302a1bd5efae47333b6df793370f3d;p=pettanr%2FclientJs.git
diff --git a/0.6.x/js/01_core/13_XClass.js b/0.6.x/js/01_core/13_XClass.js
index f0dc784..a0b15cc 100644
--- a/0.6.x/js/01_core/13_XClass.js
+++ b/0.6.x/js/01_core/13_XClass.js
@@ -36,7 +36,7 @@ X_Class_CommonMethods =
* å
¨ã¦ã®åçã¡ã³ããåé¤ãã¦ãã¤ã³ã¹ã¿ã³ã¹ãç ´æ£ããã
* ã¤ã³ã¹ã¿ã³ã¹ã X.EventDispatcher ã¨ãã®ãµãã¯ã©ã¹ã®å ´åã次ã®åä½ãããã
*
- * - X.Event.BEFORE_KILL_INSTANCE ãçºç«ãããæ»ãå¤ã®ããããã©ã°ã« X_Callback.PREVENT_DEFAULT ãç«ã¤å ´åãç ´æ£ããã£ã³ã»ã«ã X.Event.KILL_INSTANCE_CANCELED ãçºç«ããããã®éã« kill() ãå¼ã°ãã¦ãç¡è¦ãããã
+ *
- X.Event.BEFORE_KILL_INSTANCE ãçºç«ãããæ»ãå¤ã®ããããã©ã°ã« X.Callback.PREVENT_DEFAULT ãç«ã¤å ´åãç ´æ£ããã£ã³ã»ã«ã X.Event.KILL_INSTANCE_CANCELED ãçºç«ããããã®éã« kill() ãå¼ã°ãã¦ãç¡è¦ãããã
*
- ç ´æ£ã«é²ãå ´åã¯ãX.Event.KILL_INSTANCE ãçºç«ããã
*
- dispatch ä¸ã¯ãã¤ã³ã¹ã¿ã³ã¹ã®å
¨ã¦ã® dispatch ãçµäºããã¾ã§å®éã®ç ´æ£ãå¾
ã¤ã
*
- å®éã®ç ´æ£ã§ã¯ãã¤ã³ã¹ã¿ã³ã¹ã®ã¡ã³ãã®åé¤ã«å ãã¦å
¨ã¦ã®ã¤ãã³ããªã¹ãã解é¤ããã
@@ -171,7 +171,9 @@ X_Class_CommonMethods =
// index ãæ¿ãã£ã¦ããå¯è½æ§ãããã®ã§åãç´ã
if( X_Class_SUPER_CALLER[ i ] !== me ) i = X_Class_SUPER_CALLER.indexOf( me );
- if( X_Class_SUPER_STACKS[ i ] === stack ) console.log( 'ã¹ã¼ãã¼ã¯ã©ã¹ãã¾ãã¯ã¹ã¼ãã¼ã¯ã©ã¹ã®ã³ã³ã¹ãã©ã¯ã¿ã¯åå¨ãã¾ãã' );
+ if( X_Class_SUPER_STACKS[ i ] === stack ){
+ //console.log( 'ã¹ã¼ãã¼ã¯ã©ã¹ãã¾ãã¯ã¹ã¼ãã¼ã¯ã©ã¹ã®ã³ã³ã¹ãã©ã¯ã¿ã¯åå¨ãã¾ãã' );
+ };
if( stack === 0 ){
X_Class_SUPER_CALLER.splice( i, 1 );
@@ -212,7 +214,7 @@ X_Class_CommonMethods =
proto = sClass.prototype,
i = X_Class_SUPER_CALLER.indexOf( me ),
args = arguments,
- p, name, t, sFunc, ret;
+ p, name, stack, t, sFunc, ret;
if( X_Type_isFunction( myFunc ) ){
for( p in proto ){
@@ -662,7 +664,7 @@ function X_Class_actualConstructor( f, args ){
obj = def.Constructor ?
def.Constructor.apply( instance, args ) :
- instance[ 'Super' ].apply( instance, args );
+ def.SuperClass && instance[ 'Super' ].apply( instance, args );
if( obj !== instance && ( X_Type_isObject( obj ) || X_Type_isFunction( obj ) ) ){ // Class
instance[ 'kill' ]();