OSDN Git Service

Version 0.6.173, add OS detection to X.UA, fix X.Timer @Chrome & X.Audio.
[pettanr/clientJs.git] / 0.6.x / js / 01_core / 02_XUA.js
index fafe846..8302b97 100644 (file)
@@ -136,26 +136,65 @@ var X_UA = X[ 'UA' ] = {},
                X_UA[ 'webOS' ]  = true; // webOS\r
        } else\r
        if( sys.indexOf( 'Win' ) + 1 ){\r
-               console.log( 'Win' );\r
-               /**\r
-                * @alias X.UA.Windows\r
-                * @type {boolean}\r
-                */\r
-               X_UA[ 'Windows' ]  = true;\r
+\r
                switch( sys ){\r
+                       case 'WinCE' :\r
+                               /**\r
+                                * @alias X.UA.WinCE\r
+                                * @type {boolean}\r
+                                */\r
+                               X_UA[ sys ] = true;\r
+                               break;\r
                        case 'Win16' :\r
                        case 'Win32' :\r
                        case 'Win64' :\r
-                       case 'WinCE' :\r
                                /**\r
                                 * @alias X.UA.Win16\r
                                 * @alias X.UA.Win32\r
                                 * @alias X.UA.Win64\r
-                                * @alias X.UA.WinCE\r
                                 * @type {boolean}\r
                                 */\r
                                X_UA[ sys ] = true;\r
+                               \r
+                               if( v = dav.split( 'Windows NT 10' )[ 1 ] ){\r
+                                       switch( v.substr( 0, 2 ) ){\r
+                                               case '.0' : v = 10; break;\r
+                                               default : v = '?';\r
+                                       };\r
+                               } else\r
+                               if( v = dav.split( 'Windows NT ' )[ 1 ] ){\r
+                                       switch( v.substr( 0, 3 ) ){\r
+                                               case '6.3' : v = 8.1; break;\r
+                                               case '6.2' : v = 8; break;\r
+                                               case '6.1' : v = 7; break;\r
+                                               case '6.0' : v = 'Vista'; break;\r
+                                               case '5.2' : v = '2003|XP64'; break;\r
+                                               case '5.1' : v = v.indexOf( '5.1; SV1' ) ? 'XP' : 'XPSP2'; break;\r
+                                               case '5.0' : v = v.indexOf( '5.01' ) ? 2000 : '2kSP1'; break;\r
+                                               case '4.0' : v = 'NT'; break;\r
+                                               default : v = '?';\r
+                                       };                      \r
+                               } else\r
+                               if( v = dav.split( 'Windows ' )[ 1 ] ){\r
+                                       switch( v.substr( 0, 2 ) ){\r
+                                               case '98' : v = v.indexOf( '98; Win 9x 4.90' ) ? '98|98SE' : 'ME'; break;\r
+                                               case '95' : v = 95; break;\r
+                                               case '3.' : v = parseFloat( v ); break;\r
+                                               default : v = '?';\r
+                                       };      \r
+                               } else {\r
+                                       v = '?';\r
+                               };\r
+                               \r
+                               /**\r
+                                * 10, 8.1, 8, 7, Vista, 2003|XP64, XPSP2, XP, 2kSP1, 2000, ME, 98|98SE, 95, ?\r
+                                * @alias X.UA.Windows\r
+                                * @type {number|string}\r
+                                */                             \r
+                               X_UA[ 'Windows' ] = v;\r
+                               break;\r
                };\r
+\r
                // winRT\r
        } else\r
        if( sys.indexOf( 'Mac' ) + 1 ){\r