X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F05_util%2F03_XUtilImage.js;h=3047caecaa5fcaa5a1c2d6b1a714c9ba5d6328d1;hb=f74335422a0ae2d66e3ce9bfa03f0c77a107e8d1;hp=0efef95a4f61694070387a0495d817476220c48b;hpb=78f2b6b1bb07448d1c314775bf28a41b7111e386;p=pettanr%2FclientJs.git

diff --git a/0.6.x/js/05_util/03_XUtilImage.js b/0.6.x/js/05_util/03_XUtilImage.js
index 0efef95..3047cae 100644
--- a/0.6.x/js/05_util/03_XUtilImage.js
+++ b/0.6.x/js/05_util/03_XUtilImage.js
@@ -1,8 +1,12 @@
 
 var X_Util_Image_actualSize = {};
 
-X.Util.Image = {	
-	getActualDimension : X_Util_Image_getActualDimension
+/**
+ * ユーティリティ関数とユーティリティクラス
+ * @namespace X.Util.Image
+ */
+X[ 'Util' ][ 'Image' ] = {	
+	'getActualDimension' : X_Util_Image_getActualDimension
 	
 	// Alpha Image, data uri ong ...
 };
@@ -11,18 +15,22 @@ X.Util.Image = {
  * Opacity不可 NetFront3.4
  */
 
-/*
- * original
- * LICENSE: MIT
- * AUTHOR: uupaa.js@gmail.com
+/**
+ * <p>画像の実際のサイズを返します。
+ * <p>original
+ * <p> LICENSE: MIT
+ * <p> AUTHOR: uupaa.js@gmail.com
+ * @alias X.Util.Image.getActualDimension
+ * @param {Node|ImageElement|string}
+ * @return {array.<number>}
  */
 function X_Util_Image_getActualDimension( XnodeOrImageElemOrSrc ){
 	var xnode, img, remove, ret, run, memW, memH, w, h;
 
-	if( X.Type.isString( XnodeOrImageElemOrSrc ) ){
+	if( X_Type_isString( XnodeOrImageElemOrSrc ) ){
 		if( ret = X_Util_Image_actualSize[ X_URL_toAbsolutePath( XnodeOrImageElemOrSrc ) ] ) return ret;
 		
-		xnode = X_Node_systemNode.create(
+		xnode = X_Node_systemNode[ 'create' ](
 			'img',
 			{
 				src : XnodeOrImageElemOrSrc
@@ -32,19 +40,19 @@ function X_Util_Image_getActualDimension( XnodeOrImageElemOrSrc ){
 			}
 		);
 		X_Node_startUpdate();
-		img    = X_UA_DOM.IE4 ? X_Node__ie4getRawNode( xnode ) : xnode._rawObject;
+		img    = X_UA_DOM.IE4 ? X_Node__ie4getRawNode( xnode ) : xnode[ '_rawObject' ];
 		remove = true;
 	} else {
-		if( XnodeOrImageElemOrSrc.constructor === X.Node ){
+		if( XnodeOrImageElemOrSrc.constructor === Node ){
 			xnode = XnodeOrImageElemOrSrc;
-			img   = X_UA_DOM.IE4 ? X_Node__ie4getRawNode( xnode )._rawObject : xnode._rawObject;
+			img   = X_UA_DOM.IE4 ? X_Node__ie4getRawNode( xnode )[ '_rawObject' ] : xnode[ '_rawObject' ];
 		} else
-		if( X.Type.isHTMLElement( XnodeOrImageElemOrSrc ) ){
+		if( X_Type_isHTMLElement( XnodeOrImageElemOrSrc ) ){
 			img = XnodeOrImageElemOrSrc;
 		} else
-		if( XnodeOrImageElemOrSrc.constructor === X.EventDispatcher && X.Type.isImage( XnodeOrImageElemOrSrc._rawObject ) ){
+		if( XnodeOrImageElemOrSrc.constructor === X_EventDispatcher && X_Type_isImage( XnodeOrImageElemOrSrc[ '_rawObject' ] ) ){
 			xnode = XnodeOrImageElemOrSrc;
-			img   = xnode._rawObject;
+			img   = xnode[ '_rawObject' ];
 		} else {
 			return;
 		};
@@ -54,7 +62,7 @@ function X_Util_Image_getActualDimension( XnodeOrImageElemOrSrc ){
 	// for Firefox, Safari, Google Chrome
 	if( img.naturalWidth ) return [ img.naturalWidth, img.naturalHeight ];
 
-	if( 5 <= X_UA.IE ){// for IE
+	if( 5 <= X_UA[ 'IE' ] ){// for IE
 		run  = img.runtimeStyle;
 		memW = run.width;
 		memH = run.height;
@@ -89,7 +97,7 @@ function X_Util_Image_getActualDimension( XnodeOrImageElemOrSrc ){
 	
 	ret = X_Util_Image_actualSize[ img.src ] = [ w, h ];
 	
-	remove && xnode.destroy();
+	remove && xnode[ 'kill' ]();
 	
 	return ret;
 };