mirror of
https://github.com/faisalman/ua-parser-js.git
synced 2025-09-27 16:08:47 +03:00
Add getUA(), improve regxMap(), add Silk browser, add more older versions of Windows, etc
This commit is contained in:
Faisalman
parent
9bb8bdb1b0
commit
7704570581
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"title": "UA-Parser.js",
|
"title": "UA-Parser.js",
|
||||||
"name": "ua-parser-js",
|
"name": "ua-parser-js",
|
||||||
"version": "0.3.1",
|
"version": "0.3.2",
|
||||||
"author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
|
"author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
|
||||||
"description": "Lightweight JavaScript-based user-agent string parser",
|
"description": "Lightweight JavaScript-based user-agent string parser",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
|
|||||||
67
ua-parser.js
67
ua-parser.js
@ -1,9 +1,9 @@
|
|||||||
// UA-Parser.js v0.3.1
|
// UA-Parser.js v0.3.2
|
||||||
// Light-weight JavaScript-based all-in-one user-agent parser
|
// Lightweight JavaScript-based User-Agent string parser
|
||||||
// https://github.com/faisalman/ua-parser-js
|
// https://github.com/faisalman/ua-parser-js
|
||||||
//
|
//
|
||||||
// Copyright © 2012 Faisalman
|
// Copyright © 2012 Faisalman
|
||||||
// Licensed under GPLv2 & MIT
|
// Dual licensed under GPLv2 & MIT
|
||||||
|
|
||||||
(function (undefined) {
|
(function (undefined) {
|
||||||
var parser = function UAParser (uastring) {
|
var parser = function UAParser (uastring) {
|
||||||
@ -12,17 +12,20 @@
|
|||||||
|
|
||||||
// regexp mapper
|
// regexp mapper
|
||||||
var regxMap = function (ua) {
|
var regxMap = function (ua) {
|
||||||
var result;
|
var result = {}, i, j, k, l;
|
||||||
var i, j, k, l;
|
|
||||||
for (i = 1; i < arguments.length; i += 2) {
|
for (i = 1; i < arguments.length; i += 2) {
|
||||||
var regex = arguments[i];
|
var regex = arguments[i], // odd sequence (2,4,6,..)
|
||||||
var props = arguments[i + 1];
|
props = arguments[i + 1]; // even sequence (3,5,7,..)
|
||||||
var isMatchFound = false;
|
for (k = 0; k < props.length; k++) {
|
||||||
|
if (typeof props[k] == 'object') {
|
||||||
|
result[props[k][0]] = undefined;
|
||||||
|
} else {
|
||||||
|
result[props[k]] = undefined;
|
||||||
|
}
|
||||||
|
}
|
||||||
for (j = 0; j < regex.length; j++) {
|
for (j = 0; j < regex.length; j++) {
|
||||||
var match = regex[j].exec(ua);
|
var match = regex[j].exec(ua);
|
||||||
//console.log(match);
|
|
||||||
if (!!match) {
|
if (!!match) {
|
||||||
result = {};
|
|
||||||
l = 1;
|
l = 1;
|
||||||
for (k = 0; k < props.length; k++) {
|
for (k = 0; k < props.length; k++) {
|
||||||
if (typeof props[k] === 'object' && props[k].length === 2) {
|
if (typeof props[k] === 'object' && props[k].length === 2) {
|
||||||
@ -34,24 +37,10 @@
|
|||||||
result[props[k]] = (!!match[k + l]) ? match[k + l] : undefined;
|
result[props[k]] = (!!match[k + l]) ? match[k + l] : undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
isMatchFound = true;
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!isMatchFound) {
|
if(!!l) break; // break the loop if match found
|
||||||
result = {};
|
|
||||||
for (k in props) {
|
|
||||||
if (props.hasOwnProperty(k)) {
|
|
||||||
if (typeof props[k] == 'object') {
|
|
||||||
result[props[k][0]] = undefined;
|
|
||||||
} else {
|
|
||||||
result[props[k]] = undefined;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
return result;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
};
|
};
|
||||||
@ -60,6 +49,12 @@
|
|||||||
os : {
|
os : {
|
||||||
win: function (str, match) {
|
win: function (str, match) {
|
||||||
switch (match.toLowerCase()) {
|
switch (match.toLowerCase()) {
|
||||||
|
case '4.90':
|
||||||
|
return 'ME';
|
||||||
|
case 'nt3.51':
|
||||||
|
return 'NT 3.11';
|
||||||
|
case 'nt4.0':
|
||||||
|
return 'NT 4.0';
|
||||||
case 'nt 5.0':
|
case 'nt 5.0':
|
||||||
return '2000';
|
return '2000';
|
||||||
case 'nt 5.1':
|
case 'nt 5.1':
|
||||||
@ -96,7 +91,7 @@
|
|||||||
/ms(ie)\s((\d+)?[\w\.]+)/i, // Internet Explorer
|
/ms(ie)\s((\d+)?[\w\.]+)/i, // Internet Explorer
|
||||||
|
|
||||||
// Webkit/KHTML based
|
// Webkit/KHTML based
|
||||||
/(chromium|flock|rockmelt|midori|epiphany)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany
|
/(chromium|flock|rockmelt|midori|epiphany|silk)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany
|
||||||
/(chrome|omniweb|arora|dolfin|[tizenaok]{5}\s?browser)\/((\d+)?[\w\.]+)/i,
|
/(chrome|omniweb|arora|dolfin|[tizenaok]{5}\s?browser)\/((\d+)?[\w\.]+)/i,
|
||||||
// Chrome/OmniWeb/Arora/Dolphin/Tizen/Nokia
|
// Chrome/OmniWeb/Arora/Dolphin/Tizen/Nokia
|
||||||
], ['name', 'version', 'major'], [
|
], ['name', 'version', 'major'], [
|
||||||
@ -135,8 +130,10 @@
|
|||||||
return regxMap(uastring || ua, [
|
return regxMap(uastring || ua, [
|
||||||
|
|
||||||
// Windows based
|
// Windows based
|
||||||
/(windows\sphone\sos|windows)\s+([\w\.\s]+)*/i, // Windows
|
/(windows\sphone\sos|windows)\s?([nt\d\.\s]+\d)*/i // Windows
|
||||||
], ['name', ['version', /(nt\s[\d\.]+)/gi, mapper.os.win]], [
|
], ['name', ['version', /(.+)/gi, mapper.os.win]], [
|
||||||
|
/(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
|
||||||
|
], [['name', 'Windows'], ['version', /(.+)/gi, mapper.os.win]], [
|
||||||
|
|
||||||
// Mobile/Embedded OS
|
// Mobile/Embedded OS
|
||||||
/(blackberry).+version\/([\w\.]+)/i, // Blackberry
|
/(blackberry).+version\/([\w\.]+)/i, // Blackberry
|
||||||
@ -153,11 +150,11 @@
|
|||||||
/(gnu|linux)\s?([\w\.]+)*/i // Other GNU/Linux
|
/(gnu|linux)\s?([\w\.]+)*/i // Other GNU/Linux
|
||||||
], ['name', 'version'], [
|
], ['name', 'version'], [
|
||||||
|
|
||||||
/cros\s([\w\.\s]+)/i // Chromium OS
|
/cros\s([\w\.\s]+\d)/i // Chromium OS
|
||||||
], [['name', 'Chromium OS'], 'version'],[
|
], [['name', 'Chromium OS'], 'version'],[
|
||||||
|
|
||||||
// Solaris
|
// Solaris
|
||||||
/sunos\s?([\w\.\s]+)*/i // Solaris
|
/sunos\s?([\w\.\s]+\d)*/i // Solaris
|
||||||
], [['name', 'Solaris'], 'version'], [
|
], [['name', 'Solaris'], 'version'], [
|
||||||
|
|
||||||
// BSD based
|
// BSD based
|
||||||
@ -167,7 +164,7 @@
|
|||||||
/(ip[honead]+).*os\s*([\w]+)*\slike\smac/i // iOS
|
/(ip[honead]+).*os\s*([\w]+)*\slike\smac/i // iOS
|
||||||
], [['name', /.+/g, 'iOS'], ['version', /_/g, '.']], [
|
], [['name', /.+/g, 'iOS'], ['version', /_/g, '.']], [
|
||||||
|
|
||||||
/(mac\sos)\sx\s([\w\s\.]+)/i, // Mac OS
|
/(mac\sos\sx)\s([\w\s\.]+\w)/i, // Mac OS
|
||||||
], ['name', ['version', /_/g, '.']], [
|
], ['name', ['version', /_/g, '.']], [
|
||||||
|
|
||||||
// Other
|
// Other
|
||||||
@ -184,7 +181,7 @@
|
|||||||
/(blackberry)[\s-]?(\w+)/i, // BlackBerry
|
/(blackberry)[\s-]?(\w+)/i, // BlackBerry
|
||||||
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,
|
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,
|
||||||
// BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
|
// BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
|
||||||
/(hp)\s([\w\s]+)/i, // HP iPAQ
|
/(hp)\s([\w\s]+\w)/i, // HP iPAQ
|
||||||
/(hp).+(touchpad)/i, // HP TouchPad
|
/(hp).+(touchpad)/i, // HP TouchPad
|
||||||
/(kindle)\/([\w\.]+)/i, // Kindle
|
/(kindle)\/([\w\.]+)/i, // Kindle
|
||||||
/(lg)[e;\s-]+(\w+)*/i, // LG
|
/(lg)[e;\s-]+(\w+)*/i, // LG
|
||||||
@ -215,8 +212,12 @@
|
|||||||
], [['name', 'Nokia'], 'version']);
|
], [['name', 'Nokia'], 'version']);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
this.getUA = function() {
|
||||||
|
return ua;
|
||||||
|
};
|
||||||
|
|
||||||
this.setUA = function (uastring) {
|
this.setUA = function (uastring) {
|
||||||
ua = uastring || ua;
|
ua = uastring;
|
||||||
this.result = {
|
this.result = {
|
||||||
browser : this.getBrowser(),
|
browser : this.getBrowser(),
|
||||||
engine : this.getEngine(),
|
engine : this.getEngine(),
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user