X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F06_net%2F04_XNetImage.js;fp=0.6.x%2Fjs%2F06_net%2F04_XNetImage.js;h=92044e12fd5d8f9beac28406a50c08ef0cff80fc;hb=34431df46635079c1ce6626c9caf1456f88e91bd;hp=63174a47ff134f327fd0d22e86be1f0cc2072426;hpb=ada5c01a35945aced14a0f6b159035cf76668670;p=pettanr%2FclientJs.git

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