OSDN Git Service

Version 0.6.211, bug fixes AOSP PC mode at X.UA.
authoritozyun <itozyun@user.sourceforge.jp>
Wed, 10 Feb 2016 11:57:48 +0000 (20:57 +0900)
committeritozyun <itozyun@user.sourceforge.jp>
Wed, 10 Feb 2016 11:57:48 +0000 (20:57 +0900)
0.6.x/js/01_core/02_XUA.js

index 22a31f3..79f00e8 100644 (file)
@@ -270,22 +270,28 @@ var X_UA = X[ 'UA' ] = {},
                        // http://www.au.kddi.com/developer/android/kishu/ua/\r
                        // webkit version to Android version...\r
                        androidBrowserPCMode = !window.chrome || v < 534.3; // 4.0 & 3.x には chrome がいる...\r
-                       v =\r
-                               v < 529    ? 1.5 : // <= 528.5\r
-                               v < 531    ? 2.0 : // 530 2.0~2.1\r
-                                                                  // 533 2.2~2.3\r
-                               v < 534    ? ( window.HTMLAudioElement ? 2.3 : 2.2 ) :\r
-                               v < 534.3  ? (\r
-                                       !navigator[ 'connection' ] ? 4.4 :\r
-                                       document.execCommand && window.history && history.pushState ? 4.2/* & 4.3 */ : // ここに 4.1, 4.0 も入ってくる...\r
-                                       document.execCommand ? 4.1 :\r
-                                       window[ 'Int8Array' ] ? 4 : 3 ) : // 534 - 3.x~4.x , 534.13=3.x\r
-                               v < 535    ? 4.0 : // 534.30 = 4.0-4.1\r
-                               v < 536    ? 4.1 : // 535.19 = 4.1\r
-                               v < 538    ? 4.4 : 0;// 537.36 = 4.4.2-5.x\r
+                       \r
+                       if( !window[ 'Int8Array' ] ){\r
+                               v =\r
+                                       v < 529    ? 1.5 : // <= 528.5\r
+                                       v < 531    ? 2.0 : // 530 2.0~2.1\r
+                                                                          // 533 2.2~2.3\r
+                                       v < 534    ? ( window.HTMLAudioElement ? 2.3 : 2.2 ) : 0;\r
+                       } else {\r
+                               v =\r
+                                               !navigator[ 'connection' ] ? 4.4 :\r
+                                               Number.isFinite && ( window.history && window.history.pushState ) ? 4.2/* & 4.3 */ : // ここに 4.1, 4.0 も入ってくる...\r
+                                               Number.isFinite ? 4.1 : 4;\r
+                                       // 534 - 3.x~4.x , 534.13=3.x\r
+                                       // 534.30 = 4.0-4.1\r
+                                       // 535.19 = 4.1\r
+                                       // 537.36 = 4.4.2-5.x\r
+                       };\r
+\r
                        if( v ){\r
                                // PC版で見る、にチェックが付いている場合、ユーザーエージェント文字列にも platform にも Android の文字列が存在しない(標準ブラウザ&Chrome)\r
                                // Audio でタッチが必要か?の判定にとても困る...\r
+                               // ua には Linux x86_64 になっている\r
                                X_UA[ 'Android' ]    = v;\r
                        };\r
                };\r