Version 0.6.187, add Scroll-Indicator for X.UI.ScrollBox, bugfix of X.HTMLAudio.

[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 9964d58..b39d0eb 100644 (file)
--- a/0.6.x/js/05_util/01_XNinjaIframe.js
+++ b/0.6.x/js/05_util/01_XNinjaIframe.js
@@ -54,7 +54,7 @@ var X_NinjaIframe = 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_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
@@ -77,13 +77,13 @@ var X_NinjaIframe = X[ 'Util' ][ 'NinjaIframe' ] = Node[ 'inherits' ](
                                this._iwin.location.reload();\r
                        };\r
                        \r
-                       if( !opt_contentHTML && opt_contentHTML !== '' ) return this;\r
+                       if( !X_Type_isString( opt_contentHTML ) ) return this;\r
                        \r
                        this._contentHTML = opt_contentHTML;\r
 \r
                        if( !( X_UA[ 'IE' ] < 9 ) ){\r
                                X_Util_NinjaIframe_writeToIframe( this );\r
-                               this._ready = true;\r
+                               //this._ready = true;\r
                        };\r
                        \r
                        return this;\r
@@ -103,11 +103,11 @@ function X_Util_NinjaIframe_handleEvent( e ){
                        // こちらに名前をsetしないとtargetが動作しない\r
                        if( X_UA[ 'IE' ] ) this._iwin.name = this._name;\r
                        \r
-                       this[ 'listen' ]( [ X_UA[ 'IE' ] < 9 ? 'readystatechange' : 'load', 'error' ], this, X_Util_NinjaIframe_handleEvent );\r
+                       this[ 'listen' ]( X_UA[ 'IE' ] < 9 ? 'readystatechange' : [ 'load', 'error' ], X_Util_NinjaIframe_handleEvent );\r
                        \r
                        if( !( X_UA[ 'IE' ] < 9 ) ){\r
-                               ( this._contentHTML || this._contentHTML === '' ) && X_Util_NinjaIframe_writeToIframe( this );\r
-                               this._ready = true;\r
+                               X_Util_NinjaIframe_writeToIframe( this );\r
+                               //this._ready = true;\r
                                return;\r
                        };\r
                        //break; これあると IE8 で駄目！\r
@@ -116,8 +116,8 @@ function X_Util_NinjaIframe_handleEvent( e ){
                        if( ( raw.readyState !== 'complete' && raw.readyState !== 'loaded' ) ) break;\r
                        // ie9-\r
                        if( !this._ready ){\r
-                               ( this._contentHTML || this._contentHTML === '' ) && X_Util_NinjaIframe_writeToIframe( this );\r
-                               this._ready = true;\r
+                               X_Util_NinjaIframe_writeToIframe( this );\r
+                               //this._ready = true;\r
                                break;\r
                        };\r
                        // onload\r