Merge pull request darcyclarke#19 from seegno/ie11-detection

Added IE11 detection
RolandoCM · Mar 18, 2014 · af10c8d · af10c8d
2 parents 6f43a8c + f5dd23e
commit af10c8d
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 Detect.js
 =========
 
-@version 2.2.0
+@version 2.2.1
 
 **Note:** Detect.js is a JavaScript library to detect platforms, versions, manufacturers and types based on the `navigator.userAgent` string. This code is based on, and modified from, the original work of Tobie Langel's UA-Parser: https://github.com/tobie/ua-parser. UA-Parser is subsequently a port of [BrowserScope][1]'s [user agent string parser][2].
 

diff --git a/build/regexes.js b/build/regexes.js
@@ -528,6 +528,10 @@
         "family_replacement": "Teleca Browser",
         "other": true
       }, 
+      {
+        "regex": "Trident(.*)rv.(\\d+)\\.(\\d+)",
+        "family_replacement": "IE"
+      }, 
       {
         "regex": "(MSIE) (\\d+)\\.(\\d+)", 
         "family_replacement": "IE"

diff --git a/detect.js b/detect.js
@@ -3,10 +3,10 @@
  * https://github.com/darcyclarke/Detect.js
  * Dual licensed under the MIT and GPL licenses.
  *
- * @version 2.2.0
+ * @version 2.2.1
  * @author Darcy Clarke
  * @url http://darcyclarke.me
- * @createdat Mon Dec 02 2013 14:47:23 GMT+0100 (W. Europe Standard Time)
+ * @createdat Thu Feb 13 2014 11:36:42 GMT+0000 (WET)
  *
  * Based on UA-Parser (https://github.com/tobie/ua-parser) by Tobie Langel
  *
@@ -477,6 +477,9 @@
                 regex: "(Teleca)",
                 family_replacement: "Teleca Browser",
                 other: true
+            }, {
+                regex: "Trident(.*)rv.(\\d+)\\.(\\d+)",
+                family_replacement: "IE"
             }, {
                 regex: "(MSIE) (\\d+)\\.(\\d+)",
                 family_replacement: "IE"

diff --git a/detect.min.js b/detect.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Detect.js",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "author": "Darcy Clarke",
   "license": "Dual licensed under the MIT and GPL licenses.",
   "description": "JS Library to detect browser, os and device based on the UserAgent String",

diff --git a/regexes.js b/regexes.js
@@ -512,6 +512,10 @@ var regexes = {
       "family_replacement": "Teleca Browser",
       "other": true
     },
+    {
+      "regex": "Trident(.*)rv.(\\d+)\\.(\\d+)",
+      "family_replacement": "IE"
+    },
     {
       "regex": "(MSIE) (\\d+)\\.(\\d+)",
       "family_replacement": "IE"