Version 0.6.144, fix Gesture for iOS4, fix Node.css, fix X.Net.

[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 f400818..b3cb362 100644 (file)
--- a/0.6.x/js/05_util/01_XNinjaIframe.js
+++ b/0.6.x/js/05_util/01_XNinjaIframe.js
@@ -72,7 +72,7 @@ X[ 'Util' ][ 'NinjaIframe' ] = Node[ 'inherits' ](
                                this._iwin.location.reload();\r
                        };\r
                        \r
-                       if( !opt_contentHTML ) return this;\r
+                       if( !opt_contentHTML && opt_contentHTML !== '' ) return this;\r
                        \r
                        this._contentHTML = opt_contentHTML;\r
                        X_UA[ 'IE' ] < 9 || X_Util_NinjaIframe_writeToIframe( this );\r
@@ -103,7 +103,7 @@ function X_Util_NinjaIframe_handleEvent( e ){
                        this[ 'listen' ]( [ X_UA[ 'IE' ] < 9 ? 'readystatechange' : 'load', 'error' ], this, X_Util_NinjaIframe_handleEvent );\r
                        \r
                        if( !( X_UA[ 'IE' ] < 9 ) ){\r
-                               this._contentHTML && X_Util_NinjaIframe_writeToIframe( this );\r
+                               ( this._contentHTML || this._contentHTML === '' ) && X_Util_NinjaIframe_writeToIframe( this );\r
                                this._ready = true;\r
                                return;\r
                        };\r
@@ -113,18 +113,18 @@ function X_Util_NinjaIframe_handleEvent( e ){
                        if( ( raw.readyState !== 'complete' && raw.readyState !== 'loaded' ) ) break;\r
                        // ie9-\r
                        if( !this._ready ){\r
-                               this._contentHTML && X_Util_NinjaIframe_writeToIframe( this );\r
+                               ( this._contentHTML || this._contentHTML === '' ) && X_Util_NinjaIframe_writeToIframe( this );\r
                                this._ready = true;\r
                                break;\r
                        };\r
                        // onload\r
                case 'load' :\r
                        console.log( 'iframe load.' );\r
-                       this[ 'asyncDispatch' ]( X_EVENT_SUCCESS );\r
+                       this[ 'asyncDispatch' ]( 'ninjaload' );\r
                        break;\r
 \r
                case 'error' :\r
-                       this[ 'asyncDispatch' ]( X_EVENT_ERROR );\r
+                       this[ 'asyncDispatch' ]( 'ninjaerror' );\r
                        break;\r
        };\r
        \r