X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=0.6.x%2Fjs%2F00_core%2F01_XUa.js;h=1f55c6f26fffda24cff45ee8e35d840027b7ee47;hb=3525f9ca3b6a7e3e419fa1ea988925a6a9ff5ad5;hp=a9e659b6665a4f11f08a080022dc2e5cf0dbbc09;hpb=08e72a61fa7363b2fb04f5bc863df082c3067e47;p=pettanr%2FclientJs.git diff --git a/0.6.x/js/00_core/01_XUa.js b/0.6.x/js/00_core/01_XUa.js index a9e659b..1f55c6f 100644 --- a/0.6.x/js/00_core/01_XUa.js +++ b/0.6.x/js/00_core/01_XUa.js @@ -42,11 +42,17 @@ X.UA = (function( n, undefined ){ acme.IE = document.documentMode || parseFloat(dua.split('MSIE ')[1]) || parseFloat(dua.split('rv:')[1]) || parseFloat(dav.split('MSIE ')[1]) || 0; acme.IE4 = acme.IE && acme.IE < 5; acme.IE5678 = 5 <= acme.IE && acme.IE < 9; + acme.IE5 = 5 <= acme.IE && acme.IE < 5.5; + acme.IE55 = 5.5 <= acme.IE && acme.IE < 6; + acme.IE6 = 6 <= acme.IE && acme.IE < 7; + acme.IE7 = 7 <= acme.IE && acme.IE < 8; + acme.IE8 = 8 <= acme.IE && acme.IE < 9; + acme.IE9 = 9 <= acme.IE && acme.IE < 10; acme.MacIE = dua.indexOf( 'Mac_PowerPC' ) !== -1 || dua.indexOf( 'Mac_PPC' ) !== -1 || dua.indexOf( 'Mac_68K' ) !== -1; acme.IEMobile = dua.toLowerCase().indexOf( 'iemobile' ) !== -1 || n.platform === 'WinCE'; acme.WinPhone = dua.toLowerCase().indexOf( 'windows phone' ) !== -1; console.log( '>> IE : ' + acme.IE + ' ActiveX : ' + acme.ActiveX ); - // TODO XBox360, XBox1 + // TODO XBox360, XBox1, Modern or Desktop, Standalone return acme; }; @@ -135,6 +141,10 @@ X.UA = (function( n, undefined ){ console.log( '>>Khtml : ' + acme.Khtml ); } else + if( ( i = dua.indexOf( 'Android ' ) ) !== -1 ){ + acme.AndroidBrowser = parseFloat( dua.substr( i + 8 ) ) || 0; + console.log( '>> AndroidBrowser : ' + acme.Android ); + } else if( i = parseFloat(dua.split('WebKit\/')[1]) ){ acme.WebKit = i; @@ -192,7 +202,15 @@ X.UA = (function( n, undefined ){ console.log( '>> Android : ' + acme.Android ); } else if( dua.indexOf( 'iPhone;' ) !== -1 || dua.indexOf( 'iPad;' ) !== -1 || dua.indexOf( 'iPod;' ) !== -1 ){ - acme.iOS = parseFloat( dua.split( 'OS ' )[ 1 ].split( '_' ).join( '' ) ) || 1; + + v = dua.split( 'OS ' )[ 1 ].split( '_' ); + + acme.iOSMajor = parseFloat( v[ 0 ] ) || 0; + acme.iOSMinor = parseFloat( v[ 1 ] ) || 0; + acme.iOSPatch = parseFloat( v[ 2 ] ) || 0; + + acme.iOS = acme.iOSMajor + acme.iOSMinor / 10; + console.log( '>> iOS : ' + acme.iOS ); } else if( dua.indexOf( 'hp-tablet' ) !== -1 || dua.indexOf( 'webOS' ) !== -1 ){ @@ -229,6 +247,7 @@ if( X.UA.Safari && X.UA.WebKit < 525.13 ){ if( X.UA.IE < 7 ){ // error @ NN7.2 // bonus: hotfix for IE6 SP1 (bug KB823727) + // multipleIEs IE6 standalone 版では不可 document.execCommand && document.execCommand( 'BackgroundImageCache', false, true ); };