Merge branch 'master' into develop

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "ua-parser-js",
-  "version": "0.7.27",
+  "version": "0.7.28",
   "authors": [
     "Faisal Salman <[email protected]>"
   ],

package.js

@@ -1,6 +1,6 @@
 Package.describe({
   name: 'faisalman:ua-parser-js',
-  version: '0.7.27',
+  version: '0.7.28',
   summary: 'Lightweight JavaScript-based user-agent string parser',
   git: 'https://github.com/faisalman/ua-parser-js.git',
   documentation: 'readme.md'

package.json

@@ -1,7 +1,7 @@
 {
   "title": "UAParser.js",
   "name": "ua-parser-js",
-  "version": "0.7.27",
+  "version": "0.7.28",
   "author": "Faisal Salman <[email protected]> (http://faisalman.com)",
   "description": "Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data. Supports browser & node.js environment",
   "keywords": [

src/ua-parser.js

@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////////
-/* UAParser.js v0.7.27
+/* UAParser.js v0.7.28
    Copyright © 2012-2021 Faisal Salman <[email protected]>
    MIT License *//*
    Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
@@ -16,7 +16,8 @@
     // Constants
     /////////////
 
-    var LIBVERSION  = '0.7.27',
+
+    var LIBVERSION  = '0.7.28',
         EMPTY       = '',
         UNKNOWN     = '?',
         FUNC_TYPE   = 'function',
@@ -213,11 +214,12 @@
         browser : [[
 
             /\b(?:crmo|crios)\/([\w\.]+)/i                                      // Chrome for Android/iOS
-            ], [VERSION, [NAME, CHROME]], [
-            /(?:edgios|edga|edg)\/([\w\.]+)/i                                   // Microsoft Edge
-            ], [VERSION, [NAME, EDGE]], [
-            /edge\/([\w\.]+)/i                                                  // Old Edge (Trident)
-            ], [[VERSION, strMapper, oldEdgeMap], [NAME, EDGE]], [
+            ], [VERSION, [NAME, 'Chrome']], [
+            /edg(?:e|ios|a)?\/([\w\.]+)/i                                       // Microsoft Edge
+            ], [VERSION, [NAME, 'Edge']], [
+            // breaking change (reserved for next major release):
+            ///edge\/([\w\.]+)/i                                                  // Old Edge (Trident)
+            //], [[VERSION, mapper.str, maps.browser.oldEdge.version], [NAME, 'Edge']], [
 
             // Presto based
             /(opera mini)\/([\w\.-]+)/i,                                        // Opera Mini

test/browser-test.json

@@ -1184,8 +1184,8 @@
         "expect"  :
         {
             "name"    : "Edge",
-            "version" : "0.1",
-            "major"   : "0"
+            "version" : "12.0",
+            "major"   : "12"
         }
     },
     {
@@ -1194,8 +1194,8 @@
         "expect"  :
         {
             "name"    : "Edge",
-            "version" : "42",
-            "major"   : "42"
+            "version" : "17.17134",
+            "major"   : "17"
         }
     },
     {
@@ -1204,8 +1204,8 @@
         "expect"  :
         {
             "name"    : "Edge",
-            "version" : "44",
-            "major"   : "44"
+            "version" : "18.17763",
+            "major"   : "18"
         }
     },
     {