Version 0.6.168, fix X.UI.Repeater.

[pettanr/clientJs.git] / 0.6.x / js / 05_util / 01_XNinjaIframe.js

diff --git a/0.6.x/js/05_util/01_XNinjaIframe.js b/0.6.x/js/05_util/01_XNinjaIframe.js
index e16f550..08f7d21 100644 (file)
--- a/0.6.x/js/05_util/01_XNinjaIframe.js
+++ b/0.6.x/js/05_util/01_XNinjaIframe.js
@@ -50,7 +50,8 @@ X[ 'Util' ][ 'NinjaIframe' ] = Node[ 'inherits' ](
                        \r
                        if( html ) this._contentHTML = html;                    \r
                        \r
-                       this[ 'appendTo' ]( X_Node_body /* X_Node_systemNode */ );\r
+                       this[ 'appendTo' ]( X_Node_body /* X_Node_systemNode */ )\r
+                               [ 'listenOnce' ]( X_EVENT_KILL_INSTANCE, X_Util_NinjaIframe_handleEvent );\r
                        \r
                        X_ViewPort[ 'listenOnce' ]( X_EVENT_AFTER_UPDATE, this, X_Util_NinjaIframe_handleEvent );\r
                },\r
@@ -82,13 +83,6 @@ X[ 'Util' ][ 'NinjaIframe' ] = Node[ 'inherits' ](
                        };\r
                        \r
                        return this;\r
-               },\r
-               \r
-               // TODO close -> kill\r
-               'close' : function(){\r
-                       X_ViewPort[ 'unlisten' ]( X_EVENT_AFTER_UPDATE, this, X_Util_NinjaIframe_handleEvent );\r
-                       this.call( 'close' );\r
-                       this[ 'kill' ]();\r
                }\r
                \r
        }\r
@@ -131,6 +125,11 @@ function X_Util_NinjaIframe_handleEvent( e ){
                case 'error' :\r
                        this[ 'asyncDispatch' ]( 'ninjaerror' );\r
                        break;\r
+               \r
+               case X_EVENT_KILL_INSTANCE :\r
+                       X_ViewPort[ 'unlisten' ]( X_EVENT_AFTER_UPDATE, this, X_Util_NinjaIframe_handleEvent );\r
+                       this._iwin && this._iwin.close();\r
+                       break;\r
        };\r
        \r
        return X_Callback_STOP_PROPAGATION;\r