Version 0.6.208, bug fixes.

[pettanr/clientJs.git] / 0.6.x / js / 01_core / 02_XUA.js

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 (file)
--- 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' ] = {},
 \r
                // 4:3 model\r
                v = screen.width === screen.height * 1.5 || screen.width * 1.5 === screen.height;\r
-               \r
-               if( sys === 'iPhone' ){\r
-                       /**\r
-                        * @alias X.UA.iPhone\r
-                        * @type {boolean}\r
-                        */\r
-                       X_UA[ 'iPhone' ]  = true;\r
-                       if( v ){\r
+\r
+               switch( sys ){\r
+                       case 'iPhone' :\r
+                       case 'iPhone Simulator' :\r
                                /**\r
-                                * iPhone4s以下\r
-                                * @alias X.UA.iPhone_4s\r
+                                * @alias X.UA.iPhone\r
                                 * @type {boolean}\r
                                 */\r
-                               X_UA[ 'iPhone_4s' ]  = true;\r
-                               \r
-                               if( i ){\r
+                               X_UA[ 'iPhone' ]  = true;\r
+                               if( v ){\r
                                        /**\r
-                                        * iPhone3GS以下\r
-                                        * @alias X.UA.iPhone_3GS\r
+                                        * iPhone4s以下\r
+                                        * @alias X.UA.iPhone_4s\r
                                         * @type {boolean}\r
                                         */\r
-                                       X_UA[ 'iPhone_3GS' ]  = true;\r
-                               };                              \r
-                       };\r
-\r
-                       //alert( 'iPhone ' + ( X_UA[ 'iPhone_3GS' ]  ? '3GS以下' : X_UA[ 'iPhone_4s' ]  ? '4s以下' : '5以上' ) );\r
-               };\r
-               if( sys === 'iPad' ){\r
-                       /**\r
-                        * @alias X.UA.iPad\r
-                        * @type {boolean}\r
-                        */\r
-                       X_UA[ 'iPad' ]    = true;\r
-                       if( i ){\r
+                                       X_UA[ 'iPhone_4s' ]  = true;\r
+                                       \r
+                                       if( i ){\r
+                                               /**\r
+                                                * iPhone3GS以下\r
+                                                * @alias X.UA.iPhone_3GS\r
+                                                * @type {boolean}\r
+                                                */\r
+                                               X_UA[ 'iPhone_3GS' ]  = true;\r
+                                       };                              \r
+                               };\r
+                               break;\r
+                       \r
+                       case 'iPad' :\r
+                       case 'iPad Simulator' :\r
                                /**\r
-                                * iPad2以下または初代iPad mini 以下\r
-                                * @alias X.UA.iPad_2Mini1\r
+                                * @alias X.UA.iPad\r
                                 * @type {boolean}\r
                                 */\r
-                               X_UA[ 'iPad_2Mini1' ]  = true;\r
-                       };\r
-               };\r
-               if( sys === 'iPod' ){\r
-                       /**\r
-                        * @alias X.UA.iPod\r
-                        * @type {boolean}\r
-                        */\r
-                       X_UA[ 'iPod' ]    = true;\r
-\r
-                       if( v ){\r
+                               X_UA[ 'iPad' ]    = true;\r
+                               if( i ){\r
+                                       /**\r
+                                        * iPad2以下または初代iPad mini 以下\r
+                                        * @alias X.UA.iPad_2Mini1\r
+                                        * @type {boolean}\r
+                                        */\r
+                                       X_UA[ 'iPad_2Mini1' ]  = true;\r
+                               };\r
+                               break;\r
+                       \r
+                       case 'iPod' :\r
+                       case 'iPod Simulator' : // 必要??\r
                                /**\r
-                                * iPod4以下\r
-                                * @alias X.UA.iPod_4\r
+                                * @alias X.UA.iPod\r
                                 * @type {boolean}\r
                                 */\r
-                               X_UA[ 'iPod_4' ]  = true;\r
-                               \r
-                               if( i ){\r
+                               X_UA[ 'iPod' ]    = true;\r
+       \r
+                               if( v ){\r
                                        /**\r
-                                        * iPod3以下\r
-                                        * @alias X.UA.iPod_3\r
+                                        * iPod4以下\r
+                                        * @alias X.UA.iPod_4\r
                                         * @type {boolean}\r
                                         */\r
-                                       X_UA[ 'iPod_3' ]  = true;\r
-                               };                              \r
-                       };\r
-                       //alert( 'iPod touch ' + ( X_UA[ 'iPod_3' ]  ? '3以下' : X_UA[ 'iPod_4' ] ? '4以下' : '5以上' ) );\r
+                                       X_UA[ 'iPod_4' ]  = true;\r
+                                       \r
+                                       if( i ){\r
+                                               /**\r
+                                                * iPod3以下\r
+                                                * @alias X.UA.iPod_3\r
+                                                * @type {boolean}\r
+                                                */\r
+                                               X_UA[ 'iPod_3' ]  = true;\r
+                                       };                              \r
+                               };\r
+                               break;\r
                };\r
-               // TODO iPhone Simulator\r
                \r
                console.log( '>> iOS : ' + X_UA[ 'iOS' ]  );\r
        } else\r
@@ -692,16 +695,16 @@ var X_UA = X[ 'UA' ] = {},
                                 */\r
                                X_UA[ 'Safari' ] = v;\r
                        } else\r
-                       if( i <= 528.16 ){\r
-                               X_UA[ 'Safari' ] = i <   73    ? 0.8 :\r
-                                                                  i <   85    ? 0.9 :\r
-                                                                  i <  100    ? 1 :\r
-                                                                  i <  125    ? 1.1 :\r
-                                                                  i <  312    ? 1.2 :\r
-                                                                  i <  412    ? 1.3 :\r
-                                                                  i <= 419.3  ? 2 :\r
-                                                                  i <= 525.13 ? 3 :\r
-                                                                  i <= 525.25 ? 3.1 : 3.2;\r
+                       if( v <= 528.16 ){\r
+                               X_UA[ 'Safari' ] = v <   73    ? 0.8 :\r
+                                                                  v <   85    ? 0.9 :\r
+                                                                  v <  100    ? 1 :\r
+                                                                  v <  125    ? 1.1 :\r
+                                                                  v <  312    ? 1.2 :\r
+                                                                  v <  412    ? 1.3 :\r
+                                                                  v <= 419.3  ? 2 :\r
+                                                                  v <= 525.13 ? 3 :\r
+                                                                  v <= 525.25 ? 3.1 : 3.2;\r
                        };\r
                };      \r
                \r