Version 0.6.190, fix X.UI.ScrollBox & X.UI.Gesture.

[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 6f6e58b..78b62f2 100644 (file)
--- a/0.6.x/js/01_core/02_XUA.js
+++ b/0.6.x/js/01_core/02_XUA.js
@@ -323,9 +323,26 @@ var X_UA = X[ 'UA' ] = {},
 \r
                console.log( '>> Opera : ' + v );\r
        } else\r
-       \r
+       if( v = parseFloat( dav.split( 'Edge/' )[ 1 ] ) ){\r
+               /**\r
+                * Microsoft Edge\r
+                * @alias X.UA.Edge\r
+                * @type {number}\r
+                */\r
+                       X_UA[ 'Edge' ]  = v;\r
+\r
+               if( dav.indexOf( 'Mobile' ) ){\r
+                       /**\r
+                        * Microsoft Edge for Windows 10 Mobile\r
+                        * @alias X.UA.EdgeMobile\r
+                        * @type {number}\r
+                        */\r
+                               X_UA[ 'EdgeMobile' ] = v;\r
+               };\r
+\r
+       }  else\r
        // Mozilla/5.0 (Windows NT 6.3; Trident/7.0; rv:11.0) like Gecko\r
-       if( ( v = dav.split( 'Trident/' )[ 1 ] ) || document.all ){\r
+       if( ( v = dav.split( 'Trident/' )[ 1 ] ) || document.all ){ // .all は Opera にもいるので Opera の判定が先\r
                if( v = parseFloat( v ) )\r
                /**\r
                 * IE11 の互換モードの navigator.appVersion にも Trident/7.0 が書かれているため互換モードか?判定ができるc \r
@@ -342,8 +359,7 @@ var X_UA = X[ 'UA' ] = {},
                        X_UA[ 'ActiveX' ] = true;\r
 \r
                v = parseFloat( dua.split( 'MSIE ' )[ 1 ] ) ||\r
-                       parseFloat( dua.split( 'rv:' )[ 1 ] ) ||\r
-                       parseFloat( dav.split( 'MSIE ' )[ 1 ] ) || 0;\r
+                       parseFloat( dua.split( 'rv:' )[ 1 ] ) || 0;\r
 \r
                tridentToVer = X_UA[ 'Trident' ] ? ( X_UA[ 'Trident' ] + 4 | 0 ) : v;\r
 \r