Skip to content

Commit

Permalink
Win10 + MS Edge Update
Browse files Browse the repository at this point in the history
Manual update. I don't have time right now to know why node isn't
running property. :(
No minified or builded version either.
  • Loading branch information
AdrianoCahete committed Aug 25, 2015
1 parent 2743310 commit 990eb92
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ Icon?
ehthumbs.db
Thumbs.db
build/detect.custom.js
test.html
test.html
*.log
2 changes: 1 addition & 1 deletion build/config.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

var config = root.config = {
browser: 'firefox netscape opera chrome facebook twitter ie opera other'.split(' '),
browser: 'firefox netscape opera chrome facebook twitter ie opera edge other'.split(' '),
device: 'wii kindle playstation nokia blackberry palm htc acer asus lenovo lg motorola phillips samsung other'.split(' '),
os: 'android webos windows symbian blackberry other'.split(' ')
};
Expand Down
14 changes: 11 additions & 3 deletions build/regexes.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
*/
(function(root, undefined){

// Regex
// Regex
var regexes = root.regexes = {
browser_parsers: [
{
Expand Down Expand Up @@ -532,10 +532,14 @@
"regex": "Trident(.*)rv.(\\d+)\\.(\\d+)",
"family_replacement": "IE"
},
{
{
"regex": "(MSIE) (\\d+)\\.(\\d+)",
"family_replacement": "IE"
}
},
{
"regex": "(Edge)/(\\d+)\\.(\\d+)",
"family_replacement": "Edge"
},
],
os_parsers: [
{
Expand Down Expand Up @@ -594,6 +598,10 @@
{
"regex": "(Windows 98|Windows XP|Windows ME|Windows 95|Windows CE|Windows 7|Windows NT 4\\.0|Windows Vista|Windows 2000)"
},
{
+ "regex": "(Windows NT 6\\.4|Windows NT 10\\.0)",
+ "os_replacement": "Windows 10"
+ },
{
"regex": "(Windows NT 6\\.2)",
"os_replacement": "Windows 8"
Expand Down
8 changes: 7 additions & 1 deletion detect.js
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,10 @@
}, {
regex: "(MSIE) (\\d+)\\.(\\d+)",
family_replacement: "IE"
} ],
}, {
regex: "(Edge)/(\\d+)\\.(\\d+)",
family_replacement: "Edge"
}],
os_parsers: [ {
regex: "(Android) (\\d+)\\.(\\d+)(?:[.\\-]([a-z0-9]+))?"
}, {
Expand Down Expand Up @@ -530,6 +533,9 @@
}, {
regex: "(Windows 98|Windows XP|Windows ME|Windows 95|Windows CE|Windows 7|Windows NT 4\\.0|Windows Vista|Windows 2000)"
}, {
+ regex: "(Windows NT 6\\.4|Windows NT 10\\.0)",
+ os_replacement: "Windows 10"
+ }, {
regex: "(Windows NT 6\\.2)",
os_replacement: "Windows 8"
}, {
Expand Down

0 comments on commit 990eb92

Please sign in to comment.