From 4203f8144fa3d2aece2feb386e4066e66d0176c7 Mon Sep 17 00:00:00 2001
From: Nik Rolls <nik@rolls.cc>
Date: Fri, 8 May 2015 18:02:05 +1200
Subject: [PATCH] Microsoft Edge is not IE12

---
 src/ua-parser.js       | 6 ++++--
 test/browser-test.json | 4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index d31bf8d..e0c5e7f 100644
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -253,10 +253,12 @@
                                                                                 // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron
             ], [NAME, VERSION], [
 
-            /(trident).+rv[:\s]([\w\.]+).+like\sgecko/i,                        // IE11
-            /(Edge)\/((\d+)?[\w\.]+)/i                                          // IE12
+            /(trident).+rv[:\s]([\w\.]+).+like\sgecko/i                         // IE11
             ], [[NAME, 'IE'], VERSION], [
 
+            /(edge)\/((\d+)?[\w\.]+)/i                                          // Microsoft Edge
+            ], [NAME, VERSION], [
+
             /(yabrowser)\/([\w\.]+)/i                                           // Yandex
             ], [[NAME, 'Yandex'], VERSION], [
 
diff --git a/test/browser-test.json b/test/browser-test.json
index 54462c1..c2b204b 100644
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -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",
         "expect"  : 
         {
-            "name"    : "IE",
+            "name"    : "Edge",
             "version" : "12.0",
             "major"   : "12"
         }