X-Git-Url: http://git.osdn.jp/view?p=pettanr%2FclientJs.git;a=blobdiff_plain;f=0.6.x%2Fjs%2F01_core%2F02_XUA.js;fp=0.6.x%2Fjs%2F01_core%2F02_XUA.js;h=f6144720a95d5bf92f102450ec532ac4ff7820ec;hp=0437c72cbd95c61d82f1d67f1b4edc02439e4a99;hb=76ea1040608829b653422cf51b3490801d2ec1fa;hpb=009b1cd0cebdd15591a9abfb964fb57b41ccb5f9

diff --git a/0.6.x/js/01_core/02_XUA.js b/0.6.x/js/01_core/02_XUA.js
index 0437c72..f614472 100644
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -55,75 +55,78 @@ var X_UA = X[ 'UA' ] = {},
 
 		// 4:3 model
 		v = screen.width === screen.height * 1.5 || screen.width * 1.5 === screen.height;
-		
-		if( sys === 'iPhone' ){
-			/**
-			 * @alias X.UA.iPhone
-			 * @type {boolean}
-			 */
-			X_UA[ 'iPhone' ]  = true;
-			if( v ){
+
+		switch( sys ){
+			case 'iPhone' :
+			case 'iPhone Simulator' :
 				/**
-				 * iPhone4s以下
-				 * @alias X.UA.iPhone_4s
+				 * @alias X.UA.iPhone
 				 * @type {boolean}
 				 */
-				X_UA[ 'iPhone_4s' ]  = true;
-				
-				if( i ){
+				X_UA[ 'iPhone' ]  = true;
+				if( v ){
 					/**
-					 * iPhone3GS以下
-					 * @alias X.UA.iPhone_3GS
+					 * iPhone4s以下
+					 * @alias X.UA.iPhone_4s
 					 * @type {boolean}
 					 */
-					X_UA[ 'iPhone_3GS' ]  = true;
-				};				
-			};
-
-			//alert( 'iPhone ' + ( X_UA[ 'iPhone_3GS' ]  ? '3GS以下' : X_UA[ 'iPhone_4s' ]  ? '4s以下' : '5以上' ) );
-		};
-		if( sys === 'iPad' ){
-			/**
-			 * @alias X.UA.iPad
-			 * @type {boolean}
-			 */
-			X_UA[ 'iPad' ]    = true;
-			if( i ){
+					X_UA[ 'iPhone_4s' ]  = true;
+					
+					if( i ){
+						/**
+						 * iPhone3GS以下
+						 * @alias X.UA.iPhone_3GS
+						 * @type {boolean}
+						 */
+						X_UA[ 'iPhone_3GS' ]  = true;
+					};				
+				};
+				break;
+			
+			case 'iPad' :
+			case 'iPad Simulator' :
 				/**
-				 * iPad2以下または初代iPad mini 以下
-				 * @alias X.UA.iPad_2Mini1
+				 * @alias X.UA.iPad
 				 * @type {boolean}
 				 */
-				X_UA[ 'iPad_2Mini1' ]  = true;
-			};
-		};
-		if( sys === 'iPod' ){
-			/**
-			 * @alias X.UA.iPod
-			 * @type {boolean}
-			 */
-			X_UA[ 'iPod' ]    = true;
-
-			if( v ){
+				X_UA[ 'iPad' ]    = true;
+				if( i ){
+					/**
+					 * iPad2以下または初代iPad mini 以下
+					 * @alias X.UA.iPad_2Mini1
+					 * @type {boolean}
+					 */
+					X_UA[ 'iPad_2Mini1' ]  = true;
+				};
+				break;
+			
+			case 'iPod' :
+			case 'iPod Simulator' : // 必要??
 				/**
-				 * iPod4以下
-				 * @alias X.UA.iPod_4
+				 * @alias X.UA.iPod
 				 * @type {boolean}
 				 */
-				X_UA[ 'iPod_4' ]  = true;
-				
-				if( i ){
+				X_UA[ 'iPod' ]    = true;
+	
+				if( v ){
 					/**
-					 * iPod3以下
-					 * @alias X.UA.iPod_3
+					 * iPod4以下
+					 * @alias X.UA.iPod_4
 					 * @type {boolean}
 					 */
-					X_UA[ 'iPod_3' ]  = true;
-				};				
-			};
-			//alert( 'iPod touch ' + ( X_UA[ 'iPod_3' ]  ? '3以下' : X_UA[ 'iPod_4' ] ? '4以下' : '5以上' ) );
+					X_UA[ 'iPod_4' ]  = true;
+					
+					if( i ){
+						/**
+						 * iPod3以下
+						 * @alias X.UA.iPod_3
+						 * @type {boolean}
+						 */
+						X_UA[ 'iPod_3' ]  = true;
+					};				
+				};
+				break;
 		};
-		// TODO iPhone Simulator
 		
 		console.log( '>> iOS : ' + X_UA[ 'iOS' ]  );
 	} else
@@ -692,16 +695,16 @@ var X_UA = X[ 'UA' ] = {},
 				 */
 				X_UA[ 'Safari' ] = v;
 			} else
-			if( i <= 528.16 ){
-				X_UA[ 'Safari' ] = i <   73    ? 0.8 :
-								   i <   85    ? 0.9 :
-								   i <  100    ? 1 :
-								   i <  125    ? 1.1 :
-								   i <  312    ? 1.2 :
-								   i <  412    ? 1.3 :
-								   i <= 419.3  ? 2 :
-								   i <= 525.13 ? 3 :
-								   i <= 525.25 ? 3.1 : 3.2;
+			if( v <= 528.16 ){
+				X_UA[ 'Safari' ] = v <   73    ? 0.8 :
+								   v <   85    ? 0.9 :
+								   v <  100    ? 1 :
+								   v <  125    ? 1.1 :
+								   v <  312    ? 1.2 :
+								   v <  412    ? 1.3 :
+								   v <= 419.3  ? 2 :
+								   v <= 525.13 ? 3 :
+								   v <= 525.25 ? 3.1 : 3.2;
 			};
 		};