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=0437c72cbd95c61d82f1d67f1b4edc02439e4a99;hp=896be7eeb1d216f6e3ffc4e8d3981c24b6602cd5;hb=3d10dbbb167c89638f3bea6c267de8763274d30c;hpb=3c54df5e0d4f20eb32cfd73480cbc9ae8358ebbf diff --git a/0.6.x/js/01_core/02_XUA.js b/0.6.x/js/01_core/02_XUA.js index 896be7e..0437c72 100644 --- a/0.6.x/js/01_core/02_XUA.js +++ b/0.6.x/js/01_core/02_XUA.js @@ -30,7 +30,7 @@ var X_UA = X[ 'UA' ] = {}, if( sys.indexOf( 'iP' ) === 0 ){ - v = dua.split( 'OS ' )[ 1 ].split( '_' ); + v = dav.split( 'OS ' )[ 1 ].split( '_' ); i = window.devicePixelRatio === 1; /** * @alias X.UA.iOSMajor @@ -51,7 +51,7 @@ var X_UA = X[ 'UA' ] = {}, * @alias X.UA.iOS * @type {number} */ - X_UA[ 'iOS' ] = X_UA[ 'iOSMajor' ] + X_UA[ 'iOSMinor' ] / 10; + X_UA[ 'iOS' ] = X_UA[ 'iOSMajor' ] + X_UA[ 'iOSMinor' ] / 10; // 4:3 model v = screen.width === screen.height * 1.5 || screen.width * 1.5 === screen.height; @@ -123,6 +123,7 @@ var X_UA = X[ 'UA' ] = {}, }; //alert( 'iPod touch ' + ( X_UA[ 'iPod_3' ] ? '3以下' : X_UA[ 'iPod_4' ] ? '4以下' : '5以上' ) ); }; + // TODO iPhone Simulator console.log( '>> iOS : ' + X_UA[ 'iOS' ] ); } else @@ -458,7 +459,7 @@ var X_UA = X[ 'UA' ] = {}, X_UA[ 'MacIE' ] = true; }; - if( 0 < dua.toLowerCase().indexOf( 'iemobile' ) || X_UA[ 'WinCE' ] ){ + if( 0 < dua.indexOf( 'IEMobile' ) || X_UA[ 'WinCE' ] ){ /** * @alias X.UA.IEMobile * @type {boolean} @@ -466,7 +467,7 @@ var X_UA = X[ 'UA' ] = {}, X_UA[ 'IEMobile' ] = true; }; - if( 0 < dua.toLowerCase().indexOf( 'windows phone' ) || 0 < dav.indexOf( 'ZuneWP' ) ){ + if( 0 < dua.indexOf( 'Windows Phone' ) || 0 < dav.indexOf( 'ZuneWP' ) ){ /** * @alias X.UA.WinPhone * @type {boolean}