Skip to content

Commit

Permalink
Windows10 and Edge support
Browse files Browse the repository at this point in the history
  • Loading branch information
barisaydinoglu committed Sep 28, 2015
1 parent 301d6fd commit 3904255
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 9 deletions.
12 changes: 9 additions & 3 deletions dist/detectizr.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!
* Detectizr v2.1.0
* Detectizr v2.2.0
* http://barisaydinoglu.github.com/Detectizr/
*
* Written by Baris Aydinoglu (http://baris.aydinoglu.info) - Copyright 2012
* Released under the MIT license
*
* Date: 2015-09-02T21:19Z
* Date: 2015-09-28T21:37Z
*/
window.Detectizr = (function(window, navigator, document, undefined) {
var Detectizr = {},
Expand Down Expand Up @@ -364,7 +364,9 @@ window.Detectizr = (function(window, navigator, document, undefined) {
if (!os.name) {
if (is("win") || is("16bit")) {
os.name = "windows";
if (is("windows nt 6.3")) {
if (is("windows nt 10")) {
setVersion(os, "10");
} else if (is("windows nt 6.3")) {
setVersion(os, "8.1");
} else if (is("windows nt 6.2") || test(/\(windows 8\)/)) { //windows 8 chrome mac fix
setVersion(os, "8");
Expand Down Expand Up @@ -448,6 +450,10 @@ window.Detectizr = (function(window, navigator, document, undefined) {
setVersion(browser, (test(/version\/([\d\.]+)/) ? RegExp.$1 : (test(/opera(\s|\/)([\d\.]+)/) ? RegExp.$2 : "")));
} else if (is("konqueror")) {
browser.name = "konqueror";
} else if (is("edge")) {
browser.engine = "webkit";
browser.name = "edge";
setVersion(browser, (test(/edge\/([\d\.]+)/) ? RegExp.$1 : ""));
} else if (is("chrome")) {
browser.engine = "webkit";
browser.name = "chrome";
Expand Down
4 changes: 2 additions & 2 deletions dist/detectizr.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3904255

Please sign in to comment.