Version 0.6.129, fix X.Node.

[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 07803a8..c0a1d4f 100644 (file)
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -42,7 +42,7 @@ var X_UA = (function( n, undefined ){
                };\r
                if( sys === 'iPad' ){\r
                        acme.iPad   = true;\r
-                       if( i ) acme.iPod_2Mini1 = true;\r
+                       if( i ) acme.iPad_2Mini1 = true;\r
                };\r
                if( sys === 'iPod' ){\r
                        acme.iPod   = true;\r
@@ -67,6 +67,7 @@ var X_UA = (function( n, undefined ){
                        case 'WinCE' :\r
                                acme[ sys ] = true;\r
                };\r
+               // winRT\r
        } else\r
        if( sys.indexOf( 'Mac' ) + 1 ){\r
                console.log( 'Mac' );\r
@@ -81,12 +82,12 @@ var X_UA = (function( n, undefined ){
                                acme[ sys] = true;\r
                };\r
        } else\r
-       if( sys.indexOf( 'Linux' ) + 1 ){\r
+       if( ( sys.indexOf( 'Linux' ) + 1 ) || ( sys.indexOf( 'Android' ) + 1 ) ){\r
                console.log( 'Linux' );\r
                acme.Linux = true;\r
                \r
                if( ( i = dua.indexOf( 'Android' ) ) !== -1 ){\r
-                       acme.Android = parseFloat( dua.substr( i + 8 ) ) || 0;\r
+                       acme.Android = parseFloat( dua.substr( i + 8 ) ) || 0.1; // Firefox で Version が取れない！\r
                        console.log( '>> Android : ' + acme.Android );\r
                };\r
        };\r
@@ -139,9 +140,9 @@ Sleipnir Mobile     Android 2.1以上       Fenrir
                acme.IE7      = 7 <= acme.IE && acme.IE < 8;\r
                acme.IE8      = 8 <= acme.IE && acme.IE < 9;\r
                acme.IE9      = 9 <= acme.IE && acme.IE < 10;\r
-               acme.MacIE    = dua.indexOf( 'Mac_PowerPC' ) !== -1 || dua.indexOf( 'Mac_PPC' ) !== -1 || dua.indexOf( 'Mac_68K' ) !== -1;\r
+               acme.MacIE    = acme.Mac;\r
                acme.IEMobile = dua.toLowerCase().indexOf( 'iemobile' ) !== -1 || acme.WinCE;\r
-               acme.WinPhone = dua.toLowerCase().indexOf( 'windows phone' ) !== -1;\r
+               acme.WinPhone = dua.toLowerCase().indexOf( 'windows phone' ) !== -1 || 0 < dav.indexOf( 'ZuneWP' ); // ZuneWP は　IEM のデスクトップモードで使用\r
                console.log( '>> IE : ' + acme.IE + ' ActiveX : ' + acme.ActiveX );\r
                // TODO XBox360, XBox1, Modern or Desktop, Standalone\r
                return acme;\r
@@ -149,7 +150,7 @@ Sleipnir Mobile     Android 2.1以上       Fenrir
        \r
        // http://qa.support.sony.jp/solution/S0812181056444/common/nfb34_dom_200jp/dom_dom0_JP.html\r
        if( ( i = dua.indexOf( 'NetFront\/' ) !== -1 ) ){\r
-               acme.NetFront = parseFloat( dua.substr( i + 9 ) ) || 0;\r
+               acme.NetFront = parseFloat( dua.substr( i + 9 ) ) || 0.1;\r
                console.log( '>> NetFront : ' + acme.NetFront );\r
                return acme;\r
        };\r
@@ -163,8 +164,10 @@ Sleipnir Mobile    Android 2.1以上       Fenrir
        // http://www.useragentstring.com/pages/Playstation%203/\r
        // Mozilla/5.0 (PLAYSTATION 3; 3.55)\r
     // Mozilla/4.0 (PS3 (PlayStation 3); 1.00)\r
+    // https://github.com/Famous/famous/blob/1a02c8084587d80519ea4bd3b55649ab32ee2e65/examples/assets/lib/require.js\r
+    // PS3 ブラウザのロードイベントについて\r
        if( ( i = dua.toUpperCase().indexOf( 'PLAYSTATION 3' ) !== -1 ) ){\r
-               acme.PS3 = parseFloat( dua.substr( i + 15 ) ) || 0;\r
+               acme.PS3 = parseFloat( dua.substr( i + 15 ) ) || 0.1;\r
                console.log( '>> PS3 : ' + acme.PS3 );\r
                return acme;\r
        };\r
@@ -173,7 +176,7 @@ Sleipnir Mobile     Android 2.1以上       Fenrir
        // iCab/3.0.2 (Macintosh; U; PPC Mac OS X)\r
        // Mozilla/5.0 (Macintosh; U; PPC Mac OS; en) iCab 3\r
        if( ( i = dua.indexOf( 'iCab' ) !== -1 ) ){\r
-               acme.iCab = parseFloat( dua.substr( i + 5 ) ) || 0;\r
+               acme.iCab = parseFloat( dua.substr( i + 5 ) ) || 0.1;\r
                console.log( '>> iCab : ' + acme.iCab );\r
                return acme;\r
        };\r
@@ -234,13 +237,18 @@ Sleipnir Mobile   Android 2.1以上       Fenrir
                \r
        } else\r
        if( ( i = dua.indexOf( 'Android ' ) ) !== -1 ){\r
-               acme.AndroidBrowser  = i = parseFloat( dua.substr( i + 8 ) ) || 0;\r
+               acme.AndroidBrowser  = i = parseFloat( dua.substr( i + 8 ) ) || 0.1;\r
                acme.AndroidBrowser1 = 1 <= i && i < 2;\r
                acme.AndroidBrowser2 = 2 <= i && i < 3;\r
                acme.AndroidBrowser3 = 3 <= i && i < 4;\r
                acme.AndroidBrowser4 = 4 <= i && i < 5;\r
                acme.AndroidBrowser5 = 5 <= i && i < 6;\r
                console.log( '>> AndroidBrowser : ' + acme.Android );\r
+               \r
+               i = parseFloat(dua.split('WebKit\/')[1]);\r
+               acme.AndroidBrowserWebkit = i;\r
+               alert( 'AudioSprite調査:Android標準ブラウザ Webkit Version ' + i );\r
+               \r
        } else\r
        if( i = parseFloat(dua.split('WebKit\/')[1]) ){\r
                acme.WebKit = i;\r
@@ -373,3 +381,16 @@ if( X_UA.IE < 7 ){ // error @ NN7.2
        \r
        X_UA.IE_EXECOM_ERROR && alert( 'document.execCommand error!' );\r
 };\r
+\r
+/*\r
+ * HTML5 に対応しない IE8 以下でも <a>　の下に <div> を作ることができる\r
+ * その際に <div> の直前に改行文字が出現するが childNodes は長さ 1 で <div> だけの模様、、、\r
+X_UA_ATagWrapDiv = (function( e, h ){\r
+       e = document.createElement( 'div' );\r
+       e.innerHTML = h = '<a><div></div></a>';\r
+       console.log( e.innerHTML.length + '\n' + e.firstChild.tagName );\r
+       return e.childNodes.length === 1;\r
+})();\r
+\r
+console.log( 'HTML5? ' + X_UA_ATagWrapDiv ); */\r
+\r