Version 0.6.178, fix X.KB for IE5-, X.HTMLAudio for ChromeWV & AOSP.

[pettanr/clientJs.git] / 0.6.x / js / 06_net / 04_XNetImage.js

diff --git a/0.6.x/js/06_net/04_XNetImage.js b/0.6.x/js/06_net/04_XNetImage.js
index 63174a4..92044e1 100644 (file)
--- a/0.6.x/js/06_net/04_XNetImage.js
+++ b/0.6.x/js/06_net/04_XNetImage.js
@@ -6,10 +6,10 @@
  *  AUTHOR: uupaa.js@gmail.com\r
  * \r
  */\r
-var X_Net_Image_hasImage  = !!window[ 'Image' ],\r
-       X_Net_Image_image     = X_Net_Image_hasImage && new Image(),\r
+var X_ImgLoader_hasImage  = !!window[ 'Image' ],\r
+       X_ImgLoader_image     = X_ImgLoader_hasImage && new Image(),\r
        // IE では厳密には HTMLImageElement ではなく、appendChild してもサイズが取れず、removeChild に失敗する\r
-       X_Net_Image_isElement = !( X_UA[ 'IE' ] < 9 ) && X_Type_isHTMLElement( X_Net_Image_image );\r
+       X_ImgLoader_isElement = !( X_UA[ 'IE' ] < 9 ) && X_Type_isHTMLElement( X_ImgLoader_image );\r
 \r
 /*\r
  * TODO\r
@@ -17,21 +17,21 @@ var X_Net_Image_hasImage  = !!window[ 'Image' ],
  * Image は、X.EventDispatcher で、<img> は X.Node で。 \r
  */\r
 \r
-X_TEMP.X_NET_Image_init = function(){\r
-       X_NET_ImageWrapper = X_Class_override(\r
-               X_Net_Image_isElement ? Node( X_Net_Image_image ) : X_EventDispatcher( X_Net_Image_image ),\r
-               X_TEMP.X_NET_Image_params\r
+X_TEMP.X_ImgLoader_init = function(){\r
+       X_ImgLoader = X_Class_override(\r
+               X_ImgLoader_isElement ? Node( X_ImgLoader_image ) : X_EventDispatcher( X_ImgLoader_image ),\r
+               X_TEMP.X_ImgLoader_params\r
        );\r
        \r
-       X_NET_ImageWrapper[ 'listen' ]( [ 'load', 'error' /*, 'abort'*/, X_EVENT_KILL_INSTANCE ], X_NET_Image_handleEvent );\r
+       X_ImgLoader[ 'listen' ]( [ 'load', 'error' /*, 'abort'*/, X_EVENT_KILL_INSTANCE ], X_ImgLoader_handleEvent );\r
        \r
-       delete X_TEMP.X_NET_Image_init;\r
-       delete X_TEMP.X_NET_Image_params;       \r
+       delete X_TEMP.X_ImgLoader_init;\r
+       delete X_TEMP.X_ImgLoader_params;       \r
        \r
-       return X_NET_ImageWrapper;\r
+       return X_ImgLoader;\r
 };\r
 \r
-X_TEMP.X_NET_Image_params = {\r
+X_TEMP.X_ImgLoader_params = {\r
                _busy      : false,\r
                tick       : 0,\r
                timerID    : 0,\r
@@ -51,7 +51,7 @@ X_TEMP.X_NET_Image_params = {
                        if( X_UA[ 'Opera7' ] && this[ '_rawObject' ].complete ){\r
                                this[ 'asyncDispatch' ]( 'load' );\r
                        } else {\r
-                               this.timerID = X_Timer_add( this.delay, 0, this, X_NET_Image_detect );\r
+                               this.timerID = X_Timer_add( this.delay, 0, this, X_ImgLoader_detect );\r
                        };\r
                },\r
                \r
@@ -68,7 +68,7 @@ X_TEMP.X_NET_Image_params = {
                        console.log( 'X.Net.Image:reset ' + this.abspath + ' timerID:' + this.timerID );\r
                        \r
                        this.timerID && X_Timer_remove( this.timerID );\r
-                       //X_Net_Image_isElement ? this[ '_rawObject' ].removeAttribute( 'src' ) : ( this[ '_rawObject' ].src = '' );\r
+                       //X_ImgLoader_isElement ? this[ '_rawObject' ].removeAttribute( 'src' ) : ( this[ '_rawObject' ].src = '' );\r
                        this[ '_rawObject' ].src = '';\r
                        this.timerID  = 0;\r
                        this._busy    = false;\r
@@ -77,7 +77,7 @@ X_TEMP.X_NET_Image_params = {
                }\r
        };\r
 \r
-function X_NET_Image_detect(){\r
+function X_ImgLoader_detect(){\r
        var raw = this[ '_rawObject' ];\r
        \r
        if( this.finish ) return;\r
@@ -97,7 +97,7 @@ function X_NET_Image_detect(){
        };\r
 };\r
 \r
-function X_NET_Image_handleEvent( e ){\r
+function X_ImgLoader_handleEvent( e ){\r
        var size;\r
        \r
        console.log( 'X.Net.Image:handleEvent ' + e.type );\r
@@ -123,7 +123,7 @@ function X_NET_Image_handleEvent( e ){
                                return;\r
                        };\r
 \r
-                       size = X_Util_Image_getActualDimension( !X_Net_Image_isElement ? this.abspath : this );\r
+                       size = X_Util_Image_getActualDimension( !X_ImgLoader_isElement ? this.abspath : this );\r
                        this.timerID = this[ 'asyncDispatch' ]( {\r
                                'type' : X_EVENT_SUCCESS,\r
                                'src'  : this.abspath,\r
@@ -141,4 +141,4 @@ function X_NET_Image_handleEvent( e ){
 };\r
 \r
 \r
-// X_Net_Image_isElement && X_NET_ImageWrapper[ 'appendAt' ]( X.X_Node_systemNode );\r
+// X_ImgLoader_isElement && X_ImgLoader[ 'appendAt' ]( X_Node_systemNode );\r