Version 0.6.220, Fix the bug of X.HTMLParser.

[pettanr/clientJs.git] / 0.6.x / js / 20_ui / 06_AbstractUINode.js

diff --git a/0.6.x/js/20_ui/06_AbstractUINode.js b/0.6.x/js/20_ui/06_AbstractUINode.js
index 3bd4cf3..5919e21 100644 (file)
--- a/0.6.x/js/20_ui/06_AbstractUINode.js
+++ b/0.6.x/js/20_ui/06_AbstractUINode.js
@@ -342,13 +342,12 @@ var XUI_AbstractUINode = X_EventDispatcher[ 'inherits' ](
                                case 2:\r
                                        \r
                                case 1:\r
-                                       this.xnode[ 'kill' ]();\r
+                                       this.xnode[ 'remove' ]();\r
                                \r
                                        delete this.root;\r
                                        delete this.rootData;\r
                                        delete this.parent;\r
                                        delete this.parentData;\r
-                                       delete this.xnode;\r
                                        \r
                                        delete this.phase;\r
                        };\r
@@ -974,7 +973,7 @@ X.UI.AbstractUINode = X_Class_create(
                        var newNode,\r
                                //newPair = X_Pair_get( newNode ),\r
                                pair    = X_Pair_get( this ),\r
-                               attr, listeners, type, list, i, l, k;\r
+                               attr, listeners, type, list, i, l, k, def, f;\r
 \r
                        // attr もコピー\r
                        if( pair.attrObject ){\r
@@ -1010,23 +1009,15 @@ X.UI.AbstractUINode = X_Class_create(
                                                f = list[ i ];\r
                                                switch( f.cbKind ){\r
                                                        case X_CLOSURE_THIS_FUNC :\r
-                                                               if( f.lock ){\r
-                                                                       X_EventDispatcher_systemListen( newNode, type, f.context === this ? newNode : f.context, f.func, f.supplement );\r
-                                                               } else {\r
-                                                                       newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.func, f.supplement );\r
-                                                               };\r
+                                                               newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.func, f.supplement );\r
                                                                break;\r
                                                        case X_CLOSURE_HANDLEEVENT :\r
-                                                               if( f.lock ){\r
-                                                                       X_EventDispatcher_systemListen( newNode, type, f.context === this ? newNode : f.context, f.supplement );\r
-                                                               } else {\r
-                                                                       newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.supplement );\r
-                                                               };\r
+                                                               newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.context === this ? newNode : f.context, f.supplement );\r
                                                                break;\r
                                                        /*\r
                                                        case X_CLOSURE_FUNC_ONLY :\r
                                                                if( f.lock ){\r
-                                                                       X_EventDispatcher_systemListen( newNode, type, f.func, f.supplement );\r
+                                                                       newNode[ 'listen' ]( type, f.func, f.supplement );\r
                                                                } else {\r
                                                                        newNode[ f.once ? 'listenOnce' : 'listen' ]( type, f.func, f.supplement );\r
                                                                };\r