github_mirrors/ua-parser-js
3
0
Fork 1
mirror of https://github.com/faisalman/ua-parser-js.git synced 2025-09-28 00:18:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #113 from nikrolls/correct-ms-edge-detection

Browse Source 
Microsoft Edge is not IE12
This commit is contained in:
Faisal Salman 2015-05-08 20:15:13 +07:00
commit f558e657bb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ua-parser.js
View File

@ -253,10 +253,12 @@
// Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron
], [NAME, VERSION], [ ], [NAME, VERSION], [
/(trident).+rv[:\s]([\w\.]+).+like\sgecko/i, // IE11 /(trident).+rv[:\s]([\w\.]+).+like\sgecko/i // IE11
/(Edge)\/((\d+)?[\w\.]+)/i // IE12
], [[NAME, 'IE'], VERSION], [ ], [[NAME, 'IE'], VERSION], [
/(edge)\/((\d+)?[\w\.]+)/i // Microsoft Edge
], [NAME, VERSION], [
/(yabrowser)\/([\w\.]+)/i // Yandex /(yabrowser)\/([\w\.]+)/i // Yandex
], [[NAME, 'Yandex'], VERSION], [ ], [[NAME, 'Yandex'], VERSION], [

4
test/browser-test.json
View File

@ -690,11 +690,11 @@
} }
}, },
{ {
"desc" : "Windows 10 EI", "desc" : "Microsoft Edge",
"ua" : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0", "ua" : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
"expect" : "expect" :
{ {
"name" : "IE", "name" : "Edge",
"version" : "12.0", "version" : "12.0",
"major" : "12" "major" : "12"
} }