Skip to content

Commit 3904255

Browse files
Windows10 and Edge support
1 parent 301d6fd commit 3904255

File tree

6 files changed

+29
-9
lines changed

6 files changed

+29
-9
lines changed

dist/detectizr.js

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*!
2-
* Detectizr v2.1.0
2+
* Detectizr v2.2.0
33
* http://barisaydinoglu.github.com/Detectizr/
44
*
55
* Written by Baris Aydinoglu (http://baris.aydinoglu.info) - Copyright 2012
66
* Released under the MIT license
77
*
8-
* Date: 2015-09-02T21:19Z
8+
* Date: 2015-09-28T21:37Z
99
*/
1010
window.Detectizr = (function(window, navigator, document, undefined) {
1111
var Detectizr = {},
@@ -364,7 +364,9 @@ window.Detectizr = (function(window, navigator, document, undefined) {
364364
if (!os.name) {
365365
if (is("win") || is("16bit")) {
366366
os.name = "windows";
367-
if (is("windows nt 6.3")) {
367+
if (is("windows nt 10")) {
368+
setVersion(os, "10");
369+
} else if (is("windows nt 6.3")) {
368370
setVersion(os, "8.1");
369371
} else if (is("windows nt 6.2") || test(/\(windows 8\)/)) { //windows 8 chrome mac fix
370372
setVersion(os, "8");
@@ -448,6 +450,10 @@ window.Detectizr = (function(window, navigator, document, undefined) {
448450
setVersion(browser, (test(/version\/([\d\.]+)/) ? RegExp.$1 : (test(/opera(\s|\/)([\d\.]+)/) ? RegExp.$2 : "")));
449451
} else if (is("konqueror")) {
450452
browser.name = "konqueror";
453+
} else if (is("edge")) {
454+
browser.engine = "webkit";
455+
browser.name = "edge";
456+
setVersion(browser, (test(/edge\/([\d\.]+)/) ? RegExp.$1 : ""));
451457
} else if (is("chrome")) {
452458
browser.engine = "webkit";
453459
browser.name = "chrome";

dist/detectizr.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)