From 26fa49f4b0aa658d65a21fffe828f39e78302573 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 09 六月 2022 17:46:58 +0800
Subject: [PATCH] Revert "Update#139889 [ 快速篩選 ] 年資文案調整"
---
PAMapp/node_modules/ua-parser-js/src/ua-parser.js | 803 +++++++++++++++++++++++++++-----------------------------
1 files changed, 388 insertions(+), 415 deletions(-)
diff --git a/PAMapp/node_modules/ua-parser-js/src/ua-parser.js b/PAMapp/node_modules/ua-parser-js/src/ua-parser.js
index ac7112d..196bb85 100755
--- a/PAMapp/node_modules/ua-parser-js/src/ua-parser.js
+++ b/PAMapp/node_modules/ua-parser-js/src/ua-parser.js
@@ -1,11 +1,12 @@
-/*!@license
- * UAParser.js v0.7.28
- * Lightweight JavaScript-based User-Agent string parser
- * https://github.com/faisalman/ua-parser-js
- *
- * Copyright 穢 2012-2021 Faisal Salman <f@faisalman.com>
- * Licensed under MIT License
- */
+/////////////////////////////////////////////////////////////////////////////////
+/* UAParser.js v0.7.31
+ Copyright 穢 2012-2021 Faisal Salman <f@faisalman.com>
+ MIT License *//*
+ Detect Browser, Engine, OS, CPU, and Device type/model from User-Agent data.
+ Supports browser & node.js environment.
+ Demo : https://faisalman.github.io/ua-parser-js
+ Source : https://github.com/faisalman/ua-parser-js */
+/////////////////////////////////////////////////////////////////////////////////
(function (window, undefined) {
@@ -16,14 +17,14 @@
/////////////
- var LIBVERSION = '0.7.28',
+ var LIBVERSION = '0.7.31',
EMPTY = '',
UNKNOWN = '?',
FUNC_TYPE = 'function',
UNDEF_TYPE = 'undefined',
OBJ_TYPE = 'object',
STR_TYPE = 'string',
- MAJOR = 'major', // deprecated
+ MAJOR = 'major',
MODEL = 'model',
NAME = 'name',
TYPE = 'type',
@@ -38,14 +39,31 @@
EMBEDDED = 'embedded',
UA_MAX_LENGTH = 255;
+ var AMAZON = 'Amazon',
+ APPLE = 'Apple',
+ ASUS = 'ASUS',
+ BLACKBERRY = 'BlackBerry',
+ BROWSER = 'Browser',
+ CHROME = 'Chrome',
+ EDGE = 'Edge',
+ FIREFOX = 'Firefox',
+ GOOGLE = 'Google',
+ HUAWEI = 'Huawei',
+ LG = 'LG',
+ MICROSOFT = 'Microsoft',
+ MOTOROLA = 'Motorola',
+ OPERA = 'Opera',
+ SAMSUNG = 'Samsung',
+ SONY = 'Sony',
+ XIAOMI = 'Xiaomi',
+ ZEBRA = 'Zebra',
+ FACEBOOK = 'Facebook';
///////////
// Helper
//////////
-
- var util = {
- extend : function (regexes, extensions) {
+ var extend = function (regexes, extensions) {
var mergedRegexes = {};
for (var i in regexes) {
if (extensions[i] && extensions[i].length % 2 === 0) {
@@ -56,30 +74,34 @@
}
return mergedRegexes;
},
- has : function (str1, str2) {
- return typeof str1 === STR_TYPE ? str2.toLowerCase().indexOf(str1.toLowerCase()) !== -1 : false;
+ enumerize = function (arr) {
+ var enums = {};
+ for (var i=0; i<arr.length; i++) {
+ enums[arr[i].toUpperCase()] = arr[i];
+ }
+ return enums;
},
- lowerize : function (str) {
+ has = function (str1, str2) {
+ return typeof str1 === STR_TYPE ? lowerize(str2).indexOf(lowerize(str1)) !== -1 : false;
+ },
+ lowerize = function (str) {
return str.toLowerCase();
},
- major : function (version) {
- return typeof(version) === STR_TYPE ? version.replace(/[^\d\.]/g,'').split(".")[0] : undefined;
+ majorize = function (version) {
+ return typeof(version) === STR_TYPE ? version.replace(/[^\d\.]/g, EMPTY).split('.')[0] : undefined;
},
- trim : function (str, len) {
- str = str.replace(/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g, '');
- return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
- }
+ trim = function (str, len) {
+ if (typeof(str) === STR_TYPE) {
+ str = str.replace(/^\s\s*/, EMPTY).replace(/\s\s*$/, EMPTY);
+ return typeof(len) === UNDEF_TYPE ? str : str.substring(0, UA_MAX_LENGTH);
+ }
};
-
///////////////
// Map helper
//////////////
-
- var mapper = {
-
- rgx : function (ua, arrays) {
+ var rgxMapper = function (ua, arrays) {
var i = 0, j, k, p, q, matches, match;
@@ -101,7 +123,7 @@
q = props[p];
// check if given property is actually array
if (typeof q === OBJ_TYPE && q.length > 0) {
- if (q.length == 2) {
+ if (q.length === 2) {
if (typeof q[1] == FUNC_TYPE) {
// assign modified match
this[q[0]] = q[1].call(this, match);
@@ -109,7 +131,7 @@
// assign given value, ignore regex match
this[q[0]] = q[1];
}
- } else if (q.length == 3) {
+ } else if (q.length === 3) {
// check whether function or regex
if (typeof q[1] === FUNC_TYPE && !(q[1].exec && q[1].test)) {
// call function (usually string mapper)
@@ -118,7 +140,7 @@
// sanitize match using given regex
this[q[0]] = match ? match.replace(q[1], q[2]) : undefined;
}
- } else if (q.length == 4) {
+ } else if (q.length === 4) {
this[q[0]] = match ? q[3].call(this, match.replace(q[1], q[2])) : undefined;
}
} else {
@@ -131,83 +153,55 @@
}
},
- str : function (str, map) {
+ strMapper = function (str, map) {
for (var i in map) {
- // check if array
+ // check if current value is array
if (typeof map[i] === OBJ_TYPE && map[i].length > 0) {
for (var j = 0; j < map[i].length; j++) {
- if (util.has(map[i][j], str)) {
+ if (has(map[i][j], str)) {
return (i === UNKNOWN) ? undefined : i;
}
}
- } else if (util.has(map[i], str)) {
+ } else if (has(map[i], str)) {
return (i === UNKNOWN) ? undefined : i;
}
}
return str;
- }
};
-
///////////////
// String map
//////////////
-
- var maps = {
-
- browser : {
- // Safari < 3.0
- oldSafari : {
- version : {
- '1.0' : '/8',
- '1.2' : '/1',
- '1.3' : '/3',
- '2.0' : '/412',
- '2.0.2' : '/416',
- '2.0.3' : '/417',
- '2.0.4' : '/419',
- '?' : '/'
- }
- },
- oldEdge : {
- version : {
- '0.1' : '12.',
- '21' : '13.',
- '31' : '14.',
- '39' : '15.',
- '41' : '16.',
- '42' : '17.',
- '44' : '18.'
- }
- }
+ // Safari < 3.0
+ var oldSafariMap = {
+ '1.0' : '/8',
+ '1.2' : '/1',
+ '1.3' : '/3',
+ '2.0' : '/412',
+ '2.0.2' : '/416',
+ '2.0.3' : '/417',
+ '2.0.4' : '/419',
+ '?' : '/'
},
-
- os : {
- windows : {
- version : {
- 'ME' : '4.90',
- 'NT 3.11' : 'NT3.51',
- 'NT 4.0' : 'NT4.0',
- '2000' : 'NT 5.0',
- 'XP' : ['NT 5.1', 'NT 5.2'],
- 'Vista' : 'NT 6.0',
- '7' : 'NT 6.1',
- '8' : 'NT 6.2',
- '8.1' : 'NT 6.3',
- '10' : ['NT 6.4', 'NT 10.0'],
- 'RT' : 'ARM'
- }
- }
- }
+ windowsVersionMap = {
+ 'ME' : '4.90',
+ 'NT 3.11' : 'NT3.51',
+ 'NT 4.0' : 'NT4.0',
+ '2000' : 'NT 5.0',
+ 'XP' : ['NT 5.1', 'NT 5.2'],
+ 'Vista' : 'NT 6.0',
+ '7' : 'NT 6.1',
+ '8' : 'NT 6.2',
+ '8.1' : 'NT 6.3',
+ '10' : ['NT 6.4', 'NT 10.0'],
+ 'RT' : 'ARM'
};
-
//////////////
// Regex map
/////////////
-
var regexes = {
@@ -217,164 +211,155 @@
], [VERSION, [NAME, 'Chrome']], [
/edg(?:e|ios|a)?\/([\w\.]+)/i // Microsoft Edge
], [VERSION, [NAME, 'Edge']], [
- // breaking change (reserved for next major release):
- ///edge\/([\w\.]+)/i // Old Edge (Trident)
- //], [[VERSION, mapper.str, maps.browser.oldEdge.version], [NAME, 'Edge']], [
// Presto based
- /(opera\smini)\/([\w\.-]+)/i, // Opera Mini
- /(opera\s[mobiletab]{3,6})\b.+version\/([\w\.-]+)/i, // Opera Mobi/Tablet
- /(opera)(?:.+version\/|[\/\s]+)([\w\.]+)/i, // Opera
+ /(opera mini)\/([-\w\.]+)/i, // Opera Mini
+ /(opera [mobiletab]{3,6})\b.+version\/([-\w\.]+)/i, // Opera Mobi/Tablet
+ /(opera)(?:.+version\/|[\/ ]+)([\w\.]+)/i // Opera
], [NAME, VERSION], [
- /opios[\/\s]+([\w\.]+)/i // Opera mini on iphone >= 8.0
- ], [VERSION, [NAME, 'Opera Mini']], [
- /\sopr\/([\w\.]+)/i // Opera Webkit
- ], [VERSION, [NAME, 'Opera']], [
+ /opios[\/ ]+([\w\.]+)/i // Opera mini on iphone >= 8.0
+ ], [VERSION, [NAME, OPERA+' Mini']], [
+ /\bopr\/([\w\.]+)/i // Opera Webkit
+ ], [VERSION, [NAME, OPERA]], [
// Mixed
/(kindle)\/([\w\.]+)/i, // Kindle
- /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?([\w\.]*)/i, // Lunascape/Maxthon/Netfront/Jasmine/Blazer
+ /(lunascape|maxthon|netfront|jasmine|blazer)[\/ ]?([\w\.]*)/i, // Lunascape/Maxthon/Netfront/Jasmine/Blazer
// Trident based
- /(avant\s|iemobile|slim)(?:browser)?[\/\s]?([\w\.]*)/i, // Avant/IEMobile/SlimBrowser
- /(ba?idubrowser)[\/\s]?([\w\.]+)/i, // Baidu Browser
- /(?:ms|\()(ie)\s([\w\.]+)/i, // Internet Explorer
+ /(avant |iemobile|slim)(?:browser)?[\/ ]?([\w\.]*)/i, // Avant/IEMobile/SlimBrowser
+ /(ba?idubrowser)[\/ ]?([\w\.]+)/i, // Baidu Browser
+ /(?:ms|\()(ie) ([\w\.]+)/i, // Internet Explorer
- // Webkit/KHTML based
- /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon)\/([\w\.-]+)/i,
- // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
- /(rekonq|puffin|brave|whale|qqbrowserlite|qq)\/([\w\.]+)/i, // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
+ // Webkit/KHTML based // Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron/Iridium/PhantomJS/Bowser/QupZilla/Falkon
+ /(flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi|iridium|phantomjs|bowser|quark|qupzilla|falkon|rekonq|puffin|brave|whale|qqbrowserlite|qq)\/([-\w\.]+)/i,
+ // Rekonq/Puffin/Brave/Whale/QQBrowserLite/QQ, aka ShouQ
/(weibo)__([\d\.]+)/i // Weibo
], [NAME, VERSION], [
- /(?:[\s\/]uc?\s?browser|(?:juc.+)ucweb)[\/\s]?([\w\.]+)/i // UCBrowser
- ], [VERSION, [NAME, 'UCBrowser']], [
- /(?:windowswechat)?\sqbcore\/([\w\.]+)\b.*(?:windowswechat)?/i // WeChat Desktop for Windows Built-in Browser
+ /(?:\buc? ?browser|(?:juc.+)ucweb)[\/ ]?([\w\.]+)/i // UCBrowser
+ ], [VERSION, [NAME, 'UC'+BROWSER]], [
+ /\bqbcore\/([\w\.]+)/i // WeChat Desktop for Windows Built-in Browser
], [VERSION, [NAME, 'WeChat(Win) Desktop']], [
/micromessenger\/([\w\.]+)/i // WeChat
], [VERSION, [NAME, 'WeChat']], [
/konqueror\/([\w\.]+)/i // Konqueror
], [VERSION, [NAME, 'Konqueror']], [
- /trident.+rv[:\s]([\w\.]{1,9})\b.+like\sgecko/i // IE11
+ /trident.+rv[: ]([\w\.]{1,9})\b.+like gecko/i // IE11
], [VERSION, [NAME, 'IE']], [
/yabrowser\/([\w\.]+)/i // Yandex
], [VERSION, [NAME, 'Yandex']], [
/(avast|avg)\/([\w\.]+)/i // Avast/AVG Secure Browser
- ], [[NAME, /(.+)/, '$1 Secure Browser'], VERSION], [
- /focus\/([\w\.]+)/i // Firefox Focus
- ], [VERSION, [NAME, 'Firefox Focus']], [
- /opt\/([\w\.]+)/i // Opera Touch
- ], [VERSION, [NAME, 'Opera Touch']], [
- /coc_coc_browser\/([\w\.]+)/i // Coc Coc Browser
+ ], [[NAME, /(.+)/, '$1 Secure '+BROWSER], VERSION], [
+ /\bfocus\/([\w\.]+)/i // Firefox Focus
+ ], [VERSION, [NAME, FIREFOX+' Focus']], [
+ /\bopt\/([\w\.]+)/i // Opera Touch
+ ], [VERSION, [NAME, OPERA+' Touch']], [
+ /coc_coc\w+\/([\w\.]+)/i // Coc Coc Browser
], [VERSION, [NAME, 'Coc Coc']], [
/dolfin\/([\w\.]+)/i // Dolphin
], [VERSION, [NAME, 'Dolphin']], [
/coast\/([\w\.]+)/i // Opera Coast
- ], [VERSION, [NAME, 'Opera Coast']],
- [/xiaomi\/miuibrowser\/([\w\.]+)/i // MIUI Browser
- ], [VERSION, [NAME, 'MIUI Browser']], [
- /fxios\/([\w\.-]+)/i // Firefox for iOS
- ], [VERSION, [NAME, 'Firefox']], [
- /(qihu|qhbrowser|qihoobrowser|360browser)/i // 360
- ], [[NAME, '360 Browser']], [
+ ], [VERSION, [NAME, OPERA+' Coast']], [
+ /miuibrowser\/([\w\.]+)/i // MIUI Browser
+ ], [VERSION, [NAME, 'MIUI '+BROWSER]], [
+ /fxios\/([-\w\.]+)/i // Firefox for iOS
+ ], [VERSION, [NAME, FIREFOX]], [
+ /\bqihu|(qi?ho?o?|360)browser/i // 360
+ ], [[NAME, '360 '+BROWSER]], [
/(oculus|samsung|sailfish)browser\/([\w\.]+)/i
- ], [[NAME, /(.+)/, '$1 Browser'], VERSION], [ // Oculus/Samsung/Sailfish Browser
+ ], [[NAME, /(.+)/, '$1 '+BROWSER], VERSION], [ // Oculus/Samsung/Sailfish Browser
/(comodo_dragon)\/([\w\.]+)/i // Comodo Dragon
], [[NAME, /_/g, ' '], VERSION], [
- /\s(electron)\/([\w\.]+)\ssafari/i, // Electron-based App
- /(tesla)(?:\sqtcarbrowser|\/(20[12]\d\.[\w\.-]+))/i, // Tesla
- /m?(qqbrowser|baiduboxapp|2345Explorer)[\/\s]?([\w\.]+)/i // QQBrowser/Baidu App/2345 Browser
+ /(electron)\/([\w\.]+) safari/i, // Electron-based App
+ /(tesla)(?: qtcarbrowser|\/(20\d\d\.[-\w\.]+))/i, // Tesla
+ /m?(qqbrowser|baiduboxapp|2345Explorer)[\/ ]?([\w\.]+)/i // QQBrowser/Baidu App/2345 Browser
], [NAME, VERSION], [
- /(MetaSr)[\/\s]?([\w\.]+)/i, // SouGouBrowser
- /(LBBROWSER)/i // LieBao Browser
+ /(metasr)[\/ ]?([\w\.]+)/i, // SouGouBrowser
+ /(lbbrowser)/i // LieBao Browser
], [NAME], [
// WebView
- /;fbav\/([\w\.]+);/i // Facebook App for iOS & Android with version
- ], [VERSION, [NAME, 'Facebook']], [
- /FBAN\/FBIOS|FB_IAB\/FB4A/i // Facebook App for iOS & Android without version
- ], [[NAME, 'Facebook']], [
- /safari\s(line)\/([\w\.]+)/i, // Line App for iOS
+ /((?:fban\/fbios|fb_iab\/fb4a)(?!.+fbav)|;fbav\/([\w\.]+);)/i // Facebook App for iOS & Android
+ ], [[NAME, FACEBOOK], VERSION], [
+ /safari (line)\/([\w\.]+)/i, // Line App for iOS
/\b(line)\/([\w\.]+)\/iab/i, // Line App for Android
- /(chromium|instagram)[\/\s]([\w\.-]+)/i // Chromium/Instagram
+ /(chromium|instagram)[\/ ]([-\w\.]+)/i // Chromium/Instagram
], [NAME, VERSION], [
- /\bgsa\/([\w\.]+)\s.*safari\//i // Google Search Appliance on iOS
+ /\bgsa\/([\w\.]+) .*safari\//i // Google Search Appliance on iOS
], [VERSION, [NAME, 'GSA']], [
- /headlesschrome(?:\/([\w\.]+)|\s)/i // Chrome Headless
- ], [VERSION, [NAME, 'Chrome Headless']], [
+ /headlesschrome(?:\/([\w\.]+)| )/i // Chrome Headless
+ ], [VERSION, [NAME, CHROME+' Headless']], [
- /\swv\).+(chrome)\/([\w\.]+)/i // Chrome WebView
- ], [[NAME, 'Chrome WebView'], VERSION], [
+ / wv\).+(chrome)\/([\w\.]+)/i // Chrome WebView
+ ], [[NAME, CHROME+' WebView'], VERSION], [
- /droid.+\sversion\/([\w\.]+)\b.+(?:mobile\ssafari|safari)/i // Android Browser
- ], [VERSION, [NAME, 'Android Browser']], [
+ /droid.+ version\/([\w\.]+)\b.+(?:mobile safari|safari)/i // Android Browser
+ ], [VERSION, [NAME, 'Android '+BROWSER]], [
- /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i // Chrome/OmniWeb/Arora/Tizen/Nokia
+ /(chrome|omniweb|arora|[tizenoka]{5} ?browser)\/v?([\w\.]+)/i // Chrome/OmniWeb/Arora/Tizen/Nokia
], [NAME, VERSION], [
- /version\/([\w\.]+)\s.*mobile\/\w+\s(safari)/i // Mobile Safari
+ /version\/([\w\.]+) .*mobile\/\w+ (safari)/i // Mobile Safari
], [VERSION, [NAME, 'Mobile Safari']], [
- /version\/([\w\.]+)\s.*(mobile\s?safari|safari)/i // Safari & Safari Mobile
+ /version\/([\w\.]+) .*(mobile ?safari|safari)/i // Safari & Safari Mobile
], [VERSION, NAME], [
- /webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i // Safari < 3.0
- ], [NAME, [VERSION, mapper.str, maps.browser.oldSafari.version]], [
+ /webkit.+?(mobile ?safari|safari)(\/[\w\.]+)/i // Safari < 3.0
+ ], [NAME, [VERSION, strMapper, oldSafariMap]], [
/(webkit|khtml)\/([\w\.]+)/i
], [NAME, VERSION], [
// Gecko based
- /(navigator|netscape)\/([\w\.-]+)/i // Netscape
+ /(navigator|netscape\d?)\/([-\w\.]+)/i // Netscape
], [[NAME, 'Netscape'], VERSION], [
- /ile\svr;\srv:([\w\.]+)\).+firefox/i // Firefox Reality
- ], [VERSION, [NAME, 'Firefox Reality']], [
+ /mobile vr; rv:([\w\.]+)\).+firefox/i // Firefox Reality
+ ], [VERSION, [NAME, FIREFOX+' Reality']], [
/ekiohf.+(flow)\/([\w\.]+)/i, // Flow
/(swiftfox)/i, // Swiftfox
- /(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?([\w\.\+]+)/i,
- // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
- /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([\w\.-]+)$/i,
+ /(icedragon|iceweasel|camino|chimera|fennec|maemo browser|minimo|conkeror|klar)[\/ ]?([\w\.\+]+)/i,
+ // IceDragon/Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror/Klar
+ /(seamonkey|k-meleon|icecat|iceape|firebird|phoenix|palemoon|basilisk|waterfox)\/([-\w\.]+)$/i,
// Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
- /(firefox)\/([\w\.]+)\s[\w\s\-]+\/[\w\.]+$/i, // Other Firefox-based
- /(mozilla)\/([\w\.]+)\s.+rv\:.+gecko\/\d+/i, // Mozilla
+ /(firefox)\/([\w\.]+)/i, // Other Firefox-based
+ /(mozilla)\/([\w\.]+) .+rv\:.+gecko\/\d+/i, // Mozilla
// Other
- /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir)[\/\s]?([\w\.]+)/i,
- // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Sleipnir
- /(links)\s\(([\w\.]+)/i, // Links
- /(gobrowser)\/?([\w\.]*)/i, // GoBrowser
- /(ice\s?browser)\/v?([\w\._]+)/i, // ICE Browser
- /(mosaic)[\/\s]([\w\.]+)/i // Mosaic
+ /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf|sleipnir|obigo|mosaic|(?:go|ice|up)[\. ]?browser)[-\/ ]?v?([\w\.]+)/i,
+ // Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf/Sleipnir/Obigo/Mosaic/Go/ICE/UP.Browser
+ /(links) \(([\w\.]+)/i // Links
], [NAME, VERSION]
],
cpu : [[
- /(?:(amd|x(?:(?:86|64)[_-])?|wow|win)64)[;\)]/i // AMD64 (x64)
+ /(?:(amd|x(?:(?:86|64)[-_])?|wow|win)64)[;\)]/i // AMD64 (x64)
], [[ARCHITECTURE, 'amd64']], [
/(ia32(?=;))/i // IA32 (quicktime)
- ], [[ARCHITECTURE, util.lowerize]], [
+ ], [[ARCHITECTURE, lowerize]], [
/((?:i[346]|x)86)[;\)]/i // IA32 (x86)
], [[ARCHITECTURE, 'ia32']], [
- /\b(aarch64|armv?8e?l?)\b/i // ARM64
+ /\b(aarch64|arm(v?8e?l?|_?64))\b/i // ARM64
], [[ARCHITECTURE, 'arm64']], [
/\b(arm(?:v[67])?ht?n?[fl]p?)\b/i // ARMHF
], [[ARCHITECTURE, 'armhf']], [
// PocketPC mistakenly identified as PowerPC
- /windows\s(ce|mobile);\sppc;/i
+ /windows (ce|mobile); ppc;/i
], [[ARCHITECTURE, 'arm']], [
- /((?:ppc|powerpc)(?:64)?)(?:\smac|;|\))/i // PowerPC
- ], [[ARCHITECTURE, /ower/, '', util.lowerize]], [
+ /((?:ppc|powerpc)(?:64)?)(?: mac|;|\))/i // PowerPC
+ ], [[ARCHITECTURE, /ower/, EMPTY, lowerize]], [
/(sun4\w)[;\)]/i // SPARC
], [[ARCHITECTURE, 'sparc']], [
- /((?:avr32|ia64(?=;))|68k(?=\))|\barm(?:64|(?=v(?:[1-7]|[5-7]1)l?|;|eabi))|(?=atmel\s)avr|(?:irix|mips|sparc)(?:64)?\b|pa-risc)/i
+ /((?:avr32|ia64(?=;))|68k(?=\))|\barm(?=v(?:[1-7]|[5-7]1)l?|;|eabi)|(?=atmel )avr|(?:irix|mips|sparc)(?:64)?\b|pa-risc)/i
// IA64, 68K, ARM/64, AVR/32, IRIX/64, MIPS/64, SPARC/64, PA-RISC
- ], [[ARCHITECTURE, util.lowerize]]
+ ], [[ARCHITECTURE, lowerize]]
],
device : [[
@@ -385,231 +370,233 @@
/////////////////////////
// Samsung
- /\b(sch-i[89]0\d|shw-m380s|sm-[pt]\w{2,4}|gt-[pn]\d{2,4}|sgh-t8[56]9|nexus\s10)/i
- ], [MODEL, [VENDOR, 'Samsung'], [TYPE, TABLET]], [
- /\b((?:s[cgp]h|gt|sm)-\w+|galaxy\snexus)/i,
- /\ssamsung[\s-]([\w-]+)/i,
+ /\b(sch-i[89]0\d|shw-m380s|sm-[pt]\w{2,4}|gt-[pn]\d{2,4}|sgh-t8[56]9|nexus 10)/i
+ ], [MODEL, [VENDOR, SAMSUNG], [TYPE, TABLET]], [
+ /\b((?:s[cgp]h|gt|sm)-\w+|galaxy nexus)/i,
+ /samsung[- ]([-\w]+)/i,
/sec-(sgh\w+)/i
- ], [MODEL, [VENDOR, 'Samsung'], [TYPE, MOBILE]], [
+ ], [MODEL, [VENDOR, SAMSUNG], [TYPE, MOBILE]], [
// Apple
- /\((ip(?:hone|od)[\s\w]*);/i // iPod/iPhone
- ], [MODEL, [VENDOR, 'Apple'], [TYPE, MOBILE]], [
- /\((ipad);[\w\s\),;-]+apple/i, // iPad
- /applecoremedia\/[\w\.]+\s\((ipad)/i,
+ /\((ip(?:hone|od)[\w ]*);/i // iPod/iPhone
+ ], [MODEL, [VENDOR, APPLE], [TYPE, MOBILE]], [
+ /\((ipad);[-\w\),; ]+apple/i, // iPad
+ /applecoremedia\/[\w\.]+ \((ipad)/i,
/\b(ipad)\d\d?,\d\d?[;\]].+ios/i
- ], [MODEL, [VENDOR, 'Apple'], [TYPE, TABLET]], [
+ ], [MODEL, [VENDOR, APPLE], [TYPE, TABLET]], [
// Huawei
- /\b((?:agr|ags[23]|bah2?|sht?)-a?[lw]\d{2})/i,
- ], [MODEL, [VENDOR, 'Huawei'], [TYPE, TABLET]], [
- /d\/huawei([\w\s-]+)[;\)]/i,
- /\b(nexus\s6p|vog-[at]?l\d\d|ane-[at]?l[x\d]\d|eml-a?l\d\da?|lya-[at]?l\d[\dc]|clt-a?l\d\di?|ele-l\d\d)/i,
- /\b(\w{2,4}-[atu][ln][01259][019])[;\)\s]/i
- ], [MODEL, [VENDOR, 'Huawei'], [TYPE, MOBILE]], [
+ /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
+ ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
+ /(?:huawei|honor)([-\w ]+)[;\)]/i,
+ /\b(nexus 6p|\w{2,4}-[atu]?[ln][01259x][012359][an]?)\b(?!.+d\/s)/i
+ ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
// Xiaomi
- /\b(poco[\s\w]+)(?:\sbuild|\))/i, // Xiaomi POCO
- /\b;\s(\w+)\sbuild\/hm\1/i, // Xiaomi Hongmi 'numeric' models
- /\b(hm[\s\-_]?note?[\s_]?(?:\d\w)?)\sbuild/i, // Xiaomi Hongmi
- /\b(redmi[\s\-_]?(?:note|k)?[\w\s_]+)(?:\sbuild|\))/i, // Xiaomi Redmi
- /\b(mi[\s\-_]?(?:a\d|one|one[\s_]plus|note lte)?[\s_]?(?:\d?\w?)[\s_]?(?:plus)?)\sbuild/i // Xiaomi Mi
- ], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [
- /\b(mi[\s\-_]?(?:pad)(?:[\w\s_]+))(?:\sbuild|\))/i // Mi Pad tablets
- ],[[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, TABLET]], [
+ /\b(poco[\w ]+)(?: bui|\))/i, // Xiaomi POCO
+ /\b; (\w+) build\/hm\1/i, // Xiaomi Hongmi 'numeric' models
+ /\b(hm[-_ ]?note?[_ ]?(?:\d\w)?) bui/i, // Xiaomi Hongmi
+ /\b(redmi[\-_ ]?(?:note|k)?[\w_ ]+)(?: bui|\))/i, // Xiaomi Redmi
+ /\b(mi[-_ ]?(?:a\d|one|one[_ ]plus|note lte|max)?[_ ]?(?:\d?\w?)[_ ]?(?:plus|se|lite)?)(?: bui|\))/i // Xiaomi Mi
+ ], [[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, MOBILE]], [
+ /\b(mi[-_ ]?(?:pad)(?:[\w_ ]+))(?: bui|\))/i // Mi Pad tablets
+ ],[[MODEL, /_/g, ' '], [VENDOR, XIAOMI], [TYPE, TABLET]], [
// OPPO
- /;\s(\w+)\sbuild.+\soppo/i,
- /\s(cph[12]\d{3}|p(?:af|c[al]|d\w|e[ar])[mt]\d0|x9007)\b/i
+ /; (\w+) bui.+ oppo/i,
+ /\b(cph[12]\d{3}|p(?:af|c[al]|d\w|e[ar])[mt]\d0|x9007|a101op)\b/i
], [MODEL, [VENDOR, 'OPPO'], [TYPE, MOBILE]], [
// Vivo
- /\svivo\s(\w+)(?:\sbuild|\))/i,
- /\s(v[12]\d{3}\w?[at])(?:\sbuild|;)/i
+ /vivo (\w+)(?: bui|\))/i,
+ /\b(v[12]\d{3}\w?[at])(?: bui|;)/i
], [MODEL, [VENDOR, 'Vivo'], [TYPE, MOBILE]], [
// Realme
- /\s(rmx[12]\d{3})(?:\sbuild|;)/i
+ /\b(rmx[12]\d{3})(?: bui|;|\))/i
], [MODEL, [VENDOR, 'Realme'], [TYPE, MOBILE]], [
// Motorola
- /\s(milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?:?(\s4g)?)\b[\w\s]+build\//i,
- /\smot(?:orola)?[\s-](\w*)/i,
- /((?:moto[\s\w\(\)]+|xt\d{3,4}|nexus\s6)(?=\sbuild|\)))/i
- ], [MODEL, [VENDOR, 'Motorola'], [TYPE, MOBILE]], [
- /\s(mz60\d|xoom[\s2]{0,2})\sbuild\//i
- ], [MODEL, [VENDOR, 'Motorola'], [TYPE, TABLET]], [
+ /\b(milestone|droid(?:[2-4x]| (?:bionic|x2|pro|razr))?:?( 4g)?)\b[\w ]+build\//i,
+ /\bmot(?:orola)?[- ](\w*)/i,
+ /((?:moto[\w\(\) ]+|xt\d{3,4}|nexus 6)(?= bui|\)))/i
+ ], [MODEL, [VENDOR, MOTOROLA], [TYPE, MOBILE]], [
+ /\b(mz60\d|xoom[2 ]{0,2}) build\//i
+ ], [MODEL, [VENDOR, MOTOROLA], [TYPE, TABLET]], [
// LG
- /((?=lg)?[vl]k\-?\d{3})\sbuild|\s3\.[\s\w;-]{10}lg?-([06cv9]{3,4})/i
- ], [MODEL, [VENDOR, 'LG'], [TYPE, TABLET]], [
- /(lm-?f100[nv]?|nexus\s[45])/i,
- /lg[e;\s\/-]+((?!browser|netcast)\w+)/i,
- /\blg(\-?[\d\w]+)\sbuild/i
- ], [MODEL, [VENDOR, 'LG'], [TYPE, MOBILE]], [
+ /((?=lg)?[vl]k\-?\d{3}) bui| 3\.[-\w; ]{10}lg?-([06cv9]{3,4})/i
+ ], [MODEL, [VENDOR, LG], [TYPE, TABLET]], [
+ /(lm(?:-?f100[nv]?|-[\w\.]+)(?= bui|\))|nexus [45])/i,
+ /\blg[-e;\/ ]+((?!browser|netcast|android tv)\w+)/i,
+ /\blg-?([\d\w]+) bui/i
+ ], [MODEL, [VENDOR, LG], [TYPE, MOBILE]], [
// Lenovo
- /(ideatab[\w\-\s]+)/i,
- /lenovo\s?(s(?:5000|6000)(?:[\w-]+)|tab(?:[\s\w]+)|yt[\d\w-]{6}|tb[\d\w-]{6})/i // Lenovo tablets
+ /(ideatab[-\w ]+)/i,
+ /lenovo ?(s[56]000[-\w]+|tab(?:[\w ]+)|yt[-\d\w]{6}|tb[-\d\w]{6})/i
], [MODEL, [VENDOR, 'Lenovo'], [TYPE, TABLET]], [
// Nokia
- /(?:maemo|nokia).*(n900|lumia\s\d+)/i,
- /nokia[\s_-]?([\w\.-]*)/i
+ /(?:maemo|nokia).*(n900|lumia \d+)/i,
+ /nokia[-_ ]?([-\w\.]*)/i
], [[MODEL, /_/g, ' '], [VENDOR, 'Nokia'], [TYPE, MOBILE]], [
// Google
- /droid.+;\s(pixel\sc)[\s)]/i // Google Pixel C
- ], [MODEL, [VENDOR, 'Google'], [TYPE, TABLET]], [
- /droid.+;\s(pixel[\s\daxl]{0,6})(?:\sbuild|\))/i // Google Pixel
- ], [MODEL, [VENDOR, 'Google'], [TYPE, MOBILE]], [
+ /(pixel c)\b/i // Google Pixel C
+ ], [MODEL, [VENDOR, GOOGLE], [TYPE, TABLET]], [
+ /droid.+; (pixel[\daxl ]{0,6})(?: bui|\))/i // Google Pixel
+ ], [MODEL, [VENDOR, GOOGLE], [TYPE, MOBILE]], [
// Sony
- /droid.+\s([c-g]\d{4}|so[-l]\w+|xq-a\w[4-7][12])(?=\sbuild\/|\).+chrome\/(?![1-6]{0,1}\d\.))/i
- ], [MODEL, [VENDOR, 'Sony'], [TYPE, MOBILE]], [
- /sony\stablet\s[ps]\sbuild\//i,
- /(?:sony)?sgp\w+(?:\sbuild\/|\))/i
- ], [[MODEL, 'Xperia Tablet'], [VENDOR, 'Sony'], [TYPE, TABLET]], [
+ /droid.+ ([c-g]\d{4}|so[-gl]\w+|xq-a\w[4-7][12])(?= bui|\).+chrome\/(?![1-6]{0,1}\d\.))/i
+ ], [MODEL, [VENDOR, SONY], [TYPE, MOBILE]], [
+ /sony tablet [ps]/i,
+ /\b(?:sony)?sgp\w+(?: bui|\))/i
+ ], [[MODEL, 'Xperia Tablet'], [VENDOR, SONY], [TYPE, TABLET]], [
// OnePlus
- /\s(kb2005|in20[12]5|be20[12][59])\b/i,
- /\ba000(1)\sbuild/i, // OnePlus
- /\boneplus\s(a\d{4})[\s)]/i
+ / (kb2005|in20[12]5|be20[12][59])\b/i,
+ /(?:one)?(?:plus)? (a\d0\d\d)(?: b|\))/i
], [MODEL, [VENDOR, 'OnePlus'], [TYPE, MOBILE]], [
// Amazon
/(alexa)webm/i,
- /(kf[a-z]{2}wi)(\sbuild\/|\))/i, // Kindle Fire without Silk
- /(kf[a-z]+)(\sbuild\/|\)).+silk\//i // Kindle Fire HD
- ], [MODEL, [VENDOR, 'Amazon'], [TYPE, TABLET]], [
- /(sd|kf)[0349hijorstuw]+(\sbuild\/|\)).+silk\//i // Fire Phone
- ], [[MODEL, 'Fire Phone'], [VENDOR, 'Amazon'], [TYPE, MOBILE]], [
+ /(kf[a-z]{2}wi)( bui|\))/i, // Kindle Fire without Silk
+ /(kf[a-z]+)( bui|\)).+silk\//i // Kindle Fire HD
+ ], [MODEL, [VENDOR, AMAZON], [TYPE, TABLET]], [
+ /((?:sd|kf)[0349hijorstuw]+)( bui|\)).+silk\//i // Fire Phone
+ ], [[MODEL, /(.+)/g, 'Fire Phone $1'], [VENDOR, AMAZON], [TYPE, MOBILE]], [
// BlackBerry
- /\((playbook);[\w\s\),;-]+(rim)/i // BlackBerry PlayBook
+ /(playbook);[-\w\),; ]+(rim)/i // BlackBerry PlayBook
], [MODEL, VENDOR, [TYPE, TABLET]], [
- /((?:bb[a-f]|st[hv])100-\d)/i,
- /\(bb10;\s(\w+)/i // BlackBerry 10
- ], [MODEL, [VENDOR, 'BlackBerry'], [TYPE, MOBILE]], [
+ /\b((?:bb[a-f]|st[hv])100-\d)/i,
+ /\(bb10; (\w+)/i // BlackBerry 10
+ ], [MODEL, [VENDOR, BLACKBERRY], [TYPE, MOBILE]], [
// Asus
- /(?:\b|asus_)(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus\s7|padfone|p00[cj])/i
- ], [MODEL, [VENDOR, 'ASUS'], [TYPE, TABLET]], [
- /\s(z[es]6[027][01][km][ls]|zenfone\s\d\w?)\b/i
- ], [MODEL, [VENDOR, 'ASUS'], [TYPE, MOBILE]], [
+ /(?:\b|asus_)(transfo[prime ]{4,10} \w+|eeepc|slider \w+|nexus 7|padfone|p00[cj])/i
+ ], [MODEL, [VENDOR, ASUS], [TYPE, TABLET]], [
+ / (z[bes]6[027][012][km][ls]|zenfone \d\w?)\b/i
+ ], [MODEL, [VENDOR, ASUS], [TYPE, MOBILE]], [
// HTC
- /(nexus\s9)/i // HTC Nexus 9
+ /(nexus 9)/i // HTC Nexus 9
], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [
- /(htc)[;_\s-]{1,2}([\w\s]+(?=\)|\sbuild)|\w+)/i, // HTC
+ /(htc)[-;_ ]{1,2}([\w ]+(?=\)| bui)|\w+)/i, // HTC
// ZTE
- /(zte)-(\w*)/i,
- /(alcatel|geeksphone|nexian|panasonic|(?=;\s)sony)[_\s-]?([\w-]*)/i // Alcatel/GeeksPhone/Nexian/Panasonic/Sony
+ /(zte)[- ]([\w ]+?)(?: bui|\/|\))/i,
+ /(alcatel|geeksphone|nexian|panasonic|sony)[-_ ]?([-\w]*)/i // Alcatel/GeeksPhone/Nexian/Panasonic/Sony
], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
// Acer
- /droid[x\d\.\s;]+\s([ab][1-7]\-?[0178a]\d\d?)/i
+ /droid.+; ([ab][1-7]-?[0178a]\d\d?)/i
], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [
// Meizu
- /droid.+;\s(m[1-5]\snote)\sbuild/i,
- /\bmz-([\w-]{2,})/i
+ /droid.+; (m[1-5] note) bui/i,
+ /\bmz-([-\w]{2,})/i
], [MODEL, [VENDOR, 'Meizu'], [TYPE, MOBILE]], [
+ // Sharp
+ /\b(sh-?[altvz]?\d\d[a-ekm]?)/i
+ ], [MODEL, [VENDOR, 'Sharp'], [TYPE, MOBILE]], [
+
// MIXED
- /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[\s_-]?([\w-]*)/i,
+ /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|meizu|motorola|polytron)[-_ ]?([-\w]*)/i,
// BlackBerry/BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Meizu/Motorola/Polytron
- /(hp)\s([\w\s]+\w)/i, // HP iPAQ
+ /(hp) ([\w ]+\w)/i, // HP iPAQ
/(asus)-?(\w+)/i, // Asus
- /(microsoft);\s(lumia[\s\w]+)/i, // Microsoft Lumia
- /(lenovo)[_\s-]?([\w-]+)/i, // Lenovo
- /linux;.+(jolla);/i, // Jolla
- /droid.+;\s(oppo)\s?([\w\s]+)\sbuild/i // OPPO
+ /(microsoft); (lumia[\w ]+)/i, // Microsoft Lumia
+ /(lenovo)[-_ ]?([-\w]+)/i, // Lenovo
+ /(jolla)/i, // Jolla
+ /(oppo) ?([\w ]+) bui/i // OPPO
], [VENDOR, MODEL, [TYPE, MOBILE]], [
- /(archos)\s(gamepad2?)/i, // Archos
+ /(archos) (gamepad2?)/i, // Archos
/(hp).+(touchpad(?!.+tablet)|tablet)/i, // HP TouchPad
/(kindle)\/([\w\.]+)/i, // Kindle
- /\s(nook)[\w\s]+build\/(\w+)/i, // Nook
- /(dell)\s(strea[kpr\s\d]*[\dko])/i, // Dell Streak
- /[;\/]\s?(le[\s\-]+pan)[\s\-]+(\w{1,9})\sbuild/i, // Le Pan Tablets
- /[;\/]\s?(trinity)[\-\s]*(t\d{3})\sbuild/i, // Trinity Tablets
- /\b(gigaset)[\s\-]+(q\w{1,9})\sbuild/i, // Gigaset Tablets
- /\b(vodafone)\s([\w\s]+)(?:\)|\sbuild)/i // Vodafone
+ /(nook)[\w ]+build\/(\w+)/i, // Nook
+ /(dell) (strea[kpr\d ]*[\dko])/i, // Dell Streak
+ /(le[- ]+pan)[- ]+(\w{1,9}) bui/i, // Le Pan Tablets
+ /(trinity)[- ]*(t\d{3}) bui/i, // Trinity Tablets
+ /(gigaset)[- ]+(q\w{1,9}) bui/i, // Gigaset Tablets
+ /(vodafone) ([\w ]+)(?:\)| bui)/i // Vodafone
], [VENDOR, MODEL, [TYPE, TABLET]], [
- /\s(surface\sduo)\s/i // Surface Duo
- ], [MODEL, [VENDOR, 'Microsoft'], [TYPE, TABLET]], [
- /droid\s[\d\.]+;\s(fp\du?)\sbuild/i
+ /(surface duo)/i // Surface Duo
+ ], [MODEL, [VENDOR, MICROSOFT], [TYPE, TABLET]], [
+ /droid [\d\.]+; (fp\du?)(?: b|\))/i // Fairphone
], [MODEL, [VENDOR, 'Fairphone'], [TYPE, MOBILE]], [
- /\s(u304aa)\sbuild/i // AT&T
+ /(u304aa)/i // AT&T
], [MODEL, [VENDOR, 'AT&T'], [TYPE, MOBILE]], [
- /sie-(\w*)/i // Siemens
+ /\bsie-(\w*)/i // Siemens
], [MODEL, [VENDOR, 'Siemens'], [TYPE, MOBILE]], [
- /[;\/]\s?(rct\w+)\sbuild/i // RCA Tablets
+ /\b(rct\w+) b/i // RCA Tablets
], [MODEL, [VENDOR, 'RCA'], [TYPE, TABLET]], [
- /[;\/\s](venue[\d\s]{2,7})\sbuild/i // Dell Venue Tablets
+ /\b(venue[\d ]{2,7}) b/i // Dell Venue Tablets
], [MODEL, [VENDOR, 'Dell'], [TYPE, TABLET]], [
- /[;\/]\s?(q(?:mv|ta)\w+)\sbuild/i // Verizon Tablet
+ /\b(q(?:mv|ta)\w+) b/i // Verizon Tablet
], [MODEL, [VENDOR, 'Verizon'], [TYPE, TABLET]], [
- /[;\/]\s(?:barnes[&\s]+noble\s|bn[rt])([\w\s\+]*)\sbuild/i // Barnes & Noble Tablet
+ /\b(?:barnes[& ]+noble |bn[rt])([\w\+ ]*) b/i // Barnes & Noble Tablet
], [MODEL, [VENDOR, 'Barnes & Noble'], [TYPE, TABLET]], [
- /[;\/]\s(tm\d{3}\w+)\sbuild/i
+ /\b(tm\d{3}\w+) b/i
], [MODEL, [VENDOR, 'NuVision'], [TYPE, TABLET]], [
- /;\s(k88)\sbuild/i // ZTE K Series Tablet
+ /\b(k88) b/i // ZTE K Series Tablet
], [MODEL, [VENDOR, 'ZTE'], [TYPE, TABLET]], [
- /;\s(nx\d{3}j)\sbuild/i // ZTE Nubia
+ /\b(nx\d{3}j) b/i // ZTE Nubia
], [MODEL, [VENDOR, 'ZTE'], [TYPE, MOBILE]], [
- /[;\/]\s?(gen\d{3})\sbuild.*49h/i // Swiss GEN Mobile
+ /\b(gen\d{3}) b.+49h/i // Swiss GEN Mobile
], [MODEL, [VENDOR, 'Swiss'], [TYPE, MOBILE]], [
- /[;\/]\s?(zur\d{3})\sbuild/i // Swiss ZUR Tablet
+ /\b(zur\d{3}) b/i // Swiss ZUR Tablet
], [MODEL, [VENDOR, 'Swiss'], [TYPE, TABLET]], [
- /[;\/]\s?((zeki)?tb.*\b)\sbuild/i // Zeki Tablets
+ /\b((zeki)?tb.*\b) b/i // Zeki Tablets
], [MODEL, [VENDOR, 'Zeki'], [TYPE, TABLET]], [
- /[;\/]\s([yr]\d{2})\sbuild/i,
- /[;\/]\s(dragon[\-\s]+touch\s|dt)(\w{5})\sbuild/i // Dragon Touch Tablet
+ /\b([yr]\d{2}) b/i,
+ /\b(dragon[- ]+touch |dt)(\w{5}) b/i // Dragon Touch Tablet
], [[VENDOR, 'Dragon Touch'], MODEL, [TYPE, TABLET]], [
- /[;\/]\s?(ns-?\w{0,9})\sbuild/i // Insignia Tablets
+ /\b(ns-?\w{0,9}) b/i // Insignia Tablets
], [MODEL, [VENDOR, 'Insignia'], [TYPE, TABLET]], [
- /[;\/]\s?((nxa|Next)-?\w{0,9})\sbuild/i // NextBook Tablets
+ /\b((nxa|next)-?\w{0,9}) b/i // NextBook Tablets
], [MODEL, [VENDOR, 'NextBook'], [TYPE, TABLET]], [
- /[;\/]\s?(xtreme\_)?(v(1[045]|2[015]|[3469]0|7[05]))\sbuild/i
- ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [ // Voice Xtreme Phones
- /[;\/]\s?(lvtel\-)?(v1[12])\sbuild/i // LvTel Phones
+ /\b(xtreme\_)?(v(1[045]|2[015]|[3469]0|7[05])) b/i // Voice Xtreme Phones
+ ], [[VENDOR, 'Voice'], MODEL, [TYPE, MOBILE]], [
+ /\b(lvtel\-)?(v1[12]) b/i // LvTel Phones
], [[VENDOR, 'LvTel'], MODEL, [TYPE, MOBILE]], [
- /;\s(ph-1)\s/i
- ], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [ // Essential PH-1
- /[;\/]\s?(v(100md|700na|7011|917g).*\b)\sbuild/i // Envizen Tablets
+ /\b(ph-1) /i // Essential PH-1
+ ], [MODEL, [VENDOR, 'Essential'], [TYPE, MOBILE]], [
+ /\b(v(100md|700na|7011|917g).*\b) b/i // Envizen Tablets
], [MODEL, [VENDOR, 'Envizen'], [TYPE, TABLET]], [
- /[;\/]\s?(trio[\s\w\-\.]+)\sbuild/i // MachSpeed Tablets
+ /\b(trio[-\w\. ]+) b/i // MachSpeed Tablets
], [MODEL, [VENDOR, 'MachSpeed'], [TYPE, TABLET]], [
- /[;\/]\s?tu_(1491)\sbuild/i // Rotor Tablets
+ /\btu_(1491) b/i // Rotor Tablets
], [MODEL, [VENDOR, 'Rotor'], [TYPE, TABLET]], [
- /(shield[\w\s]+)\sbuild/i // Nvidia Shield Tablets
+ /(shield[\w ]+) b/i // Nvidia Shield Tablets
], [MODEL, [VENDOR, 'Nvidia'], [TYPE, TABLET]], [
- /(sprint)\s(\w+)/i // Sprint Phones
+ /(sprint) (\w+)/i // Sprint Phones
], [VENDOR, MODEL, [TYPE, MOBILE]], [
/(kin\.[onetw]{3})/i // Microsoft Kin
- ], [[MODEL, /\./g, ' '], [VENDOR, 'Microsoft'], [TYPE, MOBILE]], [
- /droid\s[\d\.]+;\s(cc6666?|et5[16]|mc[239][23]x?|vc8[03]x?)\)/i // Zebra
- ], [MODEL, [VENDOR, 'Zebra'], [TYPE, TABLET]], [
- /droid\s[\d\.]+;\s(ec30|ps20|tc[2-8]\d[kx])\)/i
- ], [MODEL, [VENDOR, 'Zebra'], [TYPE, MOBILE]], [
+ ], [[MODEL, /\./g, ' '], [VENDOR, MICROSOFT], [TYPE, MOBILE]], [
+ /droid.+; (cc6666?|et5[16]|mc[239][23]x?|vc8[03]x?)\)/i // Zebra
+ ], [MODEL, [VENDOR, ZEBRA], [TYPE, TABLET]], [
+ /droid.+; (ec30|ps20|tc[2-8]\d[kx])\)/i
+ ], [MODEL, [VENDOR, ZEBRA], [TYPE, MOBILE]], [
///////////////////
// CONSOLES
///////////////////
- /\s(ouya)\s/i, // Ouya
- /(nintendo)\s([wids3utch]+)/i // Nintendo
+ /(ouya)/i, // Ouya
+ /(nintendo) ([wids3utch]+)/i // Nintendo
], [VENDOR, MODEL, [TYPE, CONSOLE]], [
- /droid.+;\s(shield)\sbuild/i // Nvidia
+ /droid.+; (shield) bui/i // Nvidia
], [MODEL, [VENDOR, 'Nvidia'], [TYPE, CONSOLE]], [
- /(playstation\s[345portablevi]+)/i // Playstation
- ], [MODEL, [VENDOR, 'Sony'], [TYPE, CONSOLE]], [
- /[\s\(;](xbox(?:\sone)?(?!;\sxbox))[\s\);]/i // Microsoft Xbox
- ], [MODEL, [VENDOR, 'Microsoft'], [TYPE, CONSOLE]], [
+ /(playstation [345portablevi]+)/i // Playstation
+ ], [MODEL, [VENDOR, SONY], [TYPE, CONSOLE]], [
+ /\b(xbox(?: one)?(?!; xbox))[\); ]/i // Microsoft Xbox
+ ], [MODEL, [VENDOR, MICROSOFT], [TYPE, CONSOLE]], [
///////////////////
// SMARTTVS
@@ -618,61 +605,63 @@
/smart-tv.+(samsung)/i // Samsung
], [VENDOR, [TYPE, SMARTTV]], [
/hbbtv.+maple;(\d+)/i
- ], [[MODEL, /^/, 'SmartTV'], [VENDOR, 'Samsung'], [TYPE, SMARTTV]], [
- /(?:linux;\snetcast.+smarttv|lg\snetcast\.tv-201\d)/i, // LG SmartTV
- ], [[VENDOR, 'LG'], [TYPE, SMARTTV]], [
- /(apple)\s?tv/i // Apple TV
- ], [VENDOR, [MODEL, 'Apple TV'], [TYPE, SMARTTV]], [
+ ], [[MODEL, /^/, 'SmartTV'], [VENDOR, SAMSUNG], [TYPE, SMARTTV]], [
+ /(nux; netcast.+smarttv|lg (netcast\.tv-201\d|android tv))/i // LG SmartTV
+ ], [[VENDOR, LG], [TYPE, SMARTTV]], [
+ /(apple) ?tv/i // Apple TV
+ ], [VENDOR, [MODEL, APPLE+' TV'], [TYPE, SMARTTV]], [
/crkey/i // Google Chromecast
- ], [[MODEL, 'Chromecast'], [VENDOR, 'Google'], [TYPE, SMARTTV]], [
- /droid.+aft([\w])(\sbuild\/|\))/i // Fire TV
- ], [MODEL, [VENDOR, 'Amazon'], [TYPE, SMARTTV]], [
+ ], [[MODEL, CHROME+'cast'], [VENDOR, GOOGLE], [TYPE, SMARTTV]], [
+ /droid.+aft(\w)( bui|\))/i // Fire TV
+ ], [MODEL, [VENDOR, AMAZON], [TYPE, SMARTTV]], [
/\(dtv[\);].+(aquos)/i // Sharp
], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [
- /hbbtv\/\d+\.\d+\.\d+\s+\([\w\s]*;\s*(\w[^;]*);([^;]*)/i // HbbTV devices
- ], [[VENDOR, util.trim], [MODEL, util.trim], [TYPE, SMARTTV]], [
- /[\s\/\(](android\s|smart[-\s]?|opera\s)tv[;\)\s]/i // SmartTV from Unidentified Vendors
+ /\b(roku)[\dx]*[\)\/]((?:dvp-)?[\d\.]*)/i, // Roku
+ /hbbtv\/\d+\.\d+\.\d+ +\([\w ]*; *(\w[^;]*);([^;]*)/i // HbbTV devices
+ ], [[VENDOR, trim], [MODEL, trim], [TYPE, SMARTTV]], [
+ /\b(android tv|smart[- ]?tv|opera tv|tv; rv:)\b/i // SmartTV from Unidentified Vendors
], [[TYPE, SMARTTV]], [
///////////////////
// WEARABLES
///////////////////
- /((pebble))app\/[\d\.]+\s/i // Pebble
+ /((pebble))app/i // Pebble
], [VENDOR, MODEL, [TYPE, WEARABLE]], [
- /droid.+;\s(glass)\s\d/i // Google Glass
- ], [MODEL, [VENDOR, 'Google'], [TYPE, WEARABLE]], [
- /droid\s[\d\.]+;\s(wt63?0{2,3})\)/i
- ], [MODEL, [VENDOR, 'Zebra'], [TYPE, WEARABLE]], [
+ /droid.+; (glass) \d/i // Google Glass
+ ], [MODEL, [VENDOR, GOOGLE], [TYPE, WEARABLE]], [
+ /droid.+; (wt63?0{2,3})\)/i
+ ], [MODEL, [VENDOR, ZEBRA], [TYPE, WEARABLE]], [
+ /(quest( 2)?)/i // Oculus Quest
+ ], [MODEL, [VENDOR, FACEBOOK], [TYPE, WEARABLE]], [
///////////////////
// EMBEDDED
///////////////////
- /(tesla)(?:\sqtcarbrowser|\/20[12]\d\.[\w\.-]+)/i // Tesla
+ /(tesla)(?: qtcarbrowser|\/[-\w\.]+)/i // Tesla
], [VENDOR, [TYPE, EMBEDDED]], [
////////////////////
// MIXED (GENERIC)
///////////////////
- /droid .+?; ([^;]+?)(?: build|\) applewebkit).+? mobile safari/i // Android Phones from Unidentified Vendors
+ /droid .+?; ([^;]+?)(?: bui|\) applew).+? mobile safari/i // Android Phones from Unidentified Vendors
], [MODEL, [TYPE, MOBILE]], [
- /droid .+?;\s([^;]+?)(?: build|\) applewebkit).+?(?! mobile) safari/i // Android Tablets from Unidentified Vendors
+ /droid .+?; ([^;]+?)(?: bui|\) applew).+?(?! mobile) safari/i // Android Tablets from Unidentified Vendors
], [MODEL, [TYPE, TABLET]], [
- /\s(tablet|tab)[;\/]/i, // Unidentifiable Tablet
- /\s(mobile)(?:[;\/]|\ssafari)/i // Unidentifiable Mobile
- ], [[TYPE, util.lowerize]], [
- /(android[\w\.\s\-]{0,9});.+build/i // Generic Android Device
- ], [MODEL, [VENDOR, 'Generic']], [
- /(phone)/i
- ], [[TYPE, MOBILE]]
+ /\b((tablet|tab)[;\/]|focus\/\d(?!.+mobile))/i // Unidentifiable Tablet
+ ], [[TYPE, TABLET]], [
+ /(phone|mobile(?:[;\/]| safari)|pda(?=.+windows ce))/i // Unidentifiable Mobile
+ ], [[TYPE, MOBILE]], [
+ /(android[-\w\. ]{0,9});.+buil/i // Generic Android Device
+ ], [MODEL, [VENDOR, 'Generic']]
],
engine : [[
- /windows.+\sedge\/([\w\.]+)/i // EdgeHTML
- ], [VERSION, [NAME, 'EdgeHTML']], [
+ /windows.+ edge\/([\w\.]+)/i // EdgeHTML
+ ], [VERSION, [NAME, EDGE+'HTML']], [
/webkit\/537\.36.+chrome\/(?!27)([\w\.]+)/i // Blink
], [VERSION, [NAME, 'Blink']], [
@@ -680,8 +669,8 @@
/(presto)\/([\w\.]+)/i, // Presto
/(webkit|trident|netfront|netsurf|amaya|lynx|w3m|goanna)\/([\w\.]+)/i, // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m/Goanna
/ekioh(flow)\/([\w\.]+)/i, // Flow
- /(khtml|tasman|links)[\/\s]\(?([\w\.]+)/i, // KHTML/Tasman/Links
- /(icab)[\/\s]([23]\.[\d\.]+)/i // iCab
+ /(khtml|tasman|links)[\/ ]\(?([\w\.]+)/i, // KHTML/Tasman/Links
+ /(icab)[\/ ]([23]\.[\d\.]+)/i // iCab
], [NAME, VERSION], [
/rv\:([\w\.]{1,9})\b.+(gecko)/i // Gecko
@@ -691,81 +680,79 @@
os : [[
// Windows
- /microsoft\s(windows)\s(vista|xp)/i // Windows (iTunes)
+ /microsoft (windows) (vista|xp)/i // Windows (iTunes)
], [NAME, VERSION], [
- /(windows)\snt\s6\.2;\s(arm)/i, // Windows RT
- /(windows\sphone(?:\sos)*)[\s\/]?([\d\.\s\w]*)/i, // Windows Phone
- /(windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)(?!.+xbox)/i
- ], [NAME, [VERSION, mapper.str, maps.os.windows.version]], [
- /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
- ], [[NAME, 'Windows'], [VERSION, mapper.str, maps.os.windows.version]], [
+ /(windows) nt 6\.2; (arm)/i, // Windows RT
+ /(windows (?:phone(?: os)?|mobile))[\/ ]?([\d\.\w ]*)/i, // Windows Phone
+ /(windows)[\/ ]?([ntce\d\. ]+\w)(?!.+xbox)/i
+ ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
+ /(win(?=3|9|n)|win 9x )([nt\d\.]+)/i
+ ], [[NAME, 'Windows'], [VERSION, strMapper, windowsVersionMap]], [
// iOS/macOS
- /ip[honead]{2,4}\b(?:.*os\s([\w]+)\slike\smac|;\sopera)/i, // iOS
+ /ip[honead]{2,4}\b(?:.*os ([\w]+) like mac|; opera)/i, // iOS
/cfnetwork\/.+darwin/i
], [[VERSION, /_/g, '.'], [NAME, 'iOS']], [
- /(mac\sos\sx)\s?([\w\s\.]*)/i,
- /(macintosh|mac(?=_powerpc)\s)(?!.+haiku)/i // Mac OS
+ /(mac os x) ?([\w\. ]*)/i,
+ /(macintosh|mac_powerpc\b)(?!.+haiku)/i // Mac OS
], [[NAME, 'Mac OS'], [VERSION, /_/g, '.']], [
- // Mobile OSes // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo/Contiki/Sailfish OS
- /(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|sailfish|contiki)[\/\s-]?([\w\.]*)/i,
+ // Mobile OSes
+ /droid ([\w\.]+)\b.+(android[- ]x86)/i // Android-x86
+ ], [VERSION, NAME], [ // Android/WebOS/QNX/Bada/RIM/Maemo/MeeGo/Sailfish OS
+ /(android|webos|qnx|bada|rim tablet os|maemo|meego|sailfish)[-\/ ]?([\w\.]*)/i,
/(blackberry)\w*\/([\w\.]*)/i, // Blackberry
- /(tizen|kaios)[\/\s]([\w\.]+)/i, // Tizen/KaiOS
+ /(tizen|kaios)[\/ ]([\w\.]+)/i, // Tizen/KaiOS
/\((series40);/i // Series 40
], [NAME, VERSION], [
/\(bb(10);/i // BlackBerry 10
- ], [VERSION, [NAME, 'BlackBerry']], [
- /(?:symbian\s?os|symbos|s60(?=;)|series60)[\/\s-]?([\w\.]*)/i // Symbian
+ ], [VERSION, [NAME, BLACKBERRY]], [
+ /(?:symbian ?os|symbos|s60(?=;)|series60)[-\/ ]?([\w\.]*)/i // Symbian
], [VERSION, [NAME, 'Symbian']], [
- /mozilla.+\(mobile;.+gecko.+firefox/i // Firefox OS
- ], [[NAME, 'Firefox OS']], [
+ /mozilla\/[\d\.]+ \((?:mobile|tablet|tv|mobile; [\w ]+); rv:.+ gecko\/([\w\.]+)/i // Firefox OS
+ ], [VERSION, [NAME, FIREFOX+' OS']], [
/web0s;.+rt(tv)/i,
/\b(?:hp)?wos(?:browser)?\/([\w\.]+)/i // WebOS
], [VERSION, [NAME, 'webOS']], [
// Google Chromecast
/crkey\/([\d\.]+)/i // Google Chromecast
- ], [VERSION, [NAME, 'Chromecast']], [
- /(cros)\s[\w]+\s([\w\.]+\w)/i // Chromium OS
+ ], [VERSION, [NAME, CHROME+'cast']], [
+ /(cros) [\w]+ ([\w\.]+\w)/i // Chromium OS
], [[NAME, 'Chromium OS'], VERSION],[
// Console
- /(nintendo|playstation)\s([wids345portablevuch]+)/i, // Nintendo/Playstation
- /(xbox);\s+xbox\s([^\);]+)/i, // Microsoft Xbox (360, One, X, S, Series X, Series S)
-
- // GNU/Linux based
- /(mint)[\/\s\(\)]?(\w*)/i, // Mint
- /(mageia|vectorlinux)[;\s]/i, // Mageia/VectorLinux
- /(joli|[kxln]?ubuntu|debian|suse|opensuse|gentoo|arch(?=\slinux)|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk|linpus|raspbian)(?:\sgnu\/linux)?(?:\slinux)?[\/\s-]?(?!chrom|package)([\w\.-]*)/i,
- // Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware
- // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus
- /(hurd|linux)\s?([\w\.]*)/i, // Hurd/Linux
- /(gnu)\s?([\w\.]*)/i, // GNU
-
- // BSD based
- /\s([frentopc-]{0,4}bsd|dragonfly)\s?(?!amd|[ix346]{1,2}86)([\w\.]*)/i, // FreeBSD/NetBSD/OpenBSD/PC-BSD/DragonFly
- /(haiku)\s(\w+)/i // Haiku
- ], [NAME, VERSION], [
+ /(nintendo|playstation) ([wids345portablevuch]+)/i, // Nintendo/Playstation
+ /(xbox); +xbox ([^\);]+)/i, // Microsoft Xbox (360, One, X, S, Series X, Series S)
// Other
- /(sunos)\s?([\w\.\d]*)/i // Solaris
+ /\b(joli|palm)\b ?(?:os)?\/?([\w\.]*)/i, // Joli/Palm
+ /(mint)[\/\(\) ]?(\w*)/i, // Mint
+ /(mageia|vectorlinux)[; ]/i, // Mageia/VectorLinux
+ /([kxln]?ubuntu|debian|suse|opensuse|gentoo|arch(?= linux)|slackware|fedora|mandriva|centos|pclinuxos|red ?hat|zenwalk|linpus|raspbian|plan 9|minix|risc os|contiki|deepin|manjaro|elementary os|sabayon|linspire)(?: gnu\/linux)?(?: enterprise)?(?:[- ]linux)?(?:-gnu)?[-\/ ]?(?!chrom|package)([-\w\.]*)/i,
+ // Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware/Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk/Linpus/Raspbian/Plan9/Minix/RISCOS/Contiki/Deepin/Manjaro/elementary/Sabayon/Linspire
+ /(hurd|linux) ?([\w\.]*)/i, // Hurd/Linux
+ /(gnu) ?([\w\.]*)/i, // GNU
+ /\b([-frentopcghs]{0,5}bsd|dragonfly)[\/ ]?(?!amd|[ix346]{1,2}86)([\w\.]*)/i, // FreeBSD/NetBSD/OpenBSD/PC-BSD/GhostBSD/DragonFly
+ /(haiku) (\w+)/i // Haiku
+ ], [NAME, VERSION], [
+ /(sunos) ?([\w\.\d]*)/i // Solaris
], [[NAME, 'Solaris'], VERSION], [
- /((?:open)?solaris)[\/\s-]?([\w\.]*)/i, // Solaris
- /(aix)\s((\d)(?=\.|\)|\s)[\w\.])*/i, // AIX
- /(plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms|fuchsia)/i, // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS/RISCOS/OpenVMS/Fuchsia
- /(unix)\s?([\w\.]*)/i // UNIX
+ /((?:open)?solaris)[-\/ ]?([\w\.]*)/i, // Solaris
+ /(aix) ((\d)(?=\.|\)| )[\w\.])*/i, // AIX
+ /\b(beos|os\/2|amigaos|morphos|openvms|fuchsia|hp-ux)/i, // BeOS/OS2/AmigaOS/MorphOS/OpenVMS/Fuchsia/HP-UX
+ /(unix) ?([\w\.]*)/i // UNIX
], [NAME, VERSION]
]
};
-
/////////////////
// Constructor
////////////////
+
var UAParser = function (ua, extensions) {
- if (typeof ua === 'object') {
+ if (typeof ua === OBJ_TYPE) {
extensions = ua;
ua = undefined;
}
@@ -774,33 +761,43 @@
return new UAParser(ua, extensions).getResult();
}
- var _ua = ua || ((typeof window !== 'undefined' && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
- var _rgxmap = extensions ? util.extend(regexes, extensions) : regexes;
+ var _ua = ua || ((typeof window !== UNDEF_TYPE && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
+ var _rgxmap = extensions ? extend(regexes, extensions) : regexes;
this.getBrowser = function () {
- var _browser = { name: undefined, version: undefined };
- mapper.rgx.call(_browser, _ua, _rgxmap.browser);
- _browser.major = util.major(_browser.version); // deprecated
+ var _browser = {};
+ _browser[NAME] = undefined;
+ _browser[VERSION] = undefined;
+ rgxMapper.call(_browser, _ua, _rgxmap.browser);
+ _browser.major = majorize(_browser.version);
return _browser;
};
this.getCPU = function () {
- var _cpu = { architecture: undefined };
- mapper.rgx.call(_cpu, _ua, _rgxmap.cpu);
+ var _cpu = {};
+ _cpu[ARCHITECTURE] = undefined;
+ rgxMapper.call(_cpu, _ua, _rgxmap.cpu);
return _cpu;
};
this.getDevice = function () {
- var _device = { vendor: undefined, model: undefined, type: undefined };
- mapper.rgx.call(_device, _ua, _rgxmap.device);
+ var _device = {};
+ _device[VENDOR] = undefined;
+ _device[MODEL] = undefined;
+ _device[TYPE] = undefined;
+ rgxMapper.call(_device, _ua, _rgxmap.device);
return _device;
};
this.getEngine = function () {
- var _engine = { name: undefined, version: undefined };
- mapper.rgx.call(_engine, _ua, _rgxmap.engine);
+ var _engine = {};
+ _engine[NAME] = undefined;
+ _engine[VERSION] = undefined;
+ rgxMapper.call(_engine, _ua, _rgxmap.engine);
return _engine;
};
this.getOS = function () {
- var _os = { name: undefined, version: undefined };
- mapper.rgx.call(_os, _ua, _rgxmap.os);
+ var _os = {};
+ _os[NAME] = undefined;
+ _os[VERSION] = undefined;
+ rgxMapper.call(_os, _ua, _rgxmap.os);
return _os;
};
this.getResult = function () {
@@ -817,7 +814,7 @@
return _ua;
};
this.setUA = function (ua) {
- _ua = (typeof ua === STR_TYPE && ua.length > UA_MAX_LENGTH) ? util.trim(ua, UA_MAX_LENGTH) : ua;
+ _ua = (typeof ua === STR_TYPE && ua.length > UA_MAX_LENGTH) ? trim(ua, UA_MAX_LENGTH) : ua;
return this;
};
this.setUA(_ua);
@@ -825,38 +822,14 @@
};
UAParser.VERSION = LIBVERSION;
- UAParser.BROWSER = {
- NAME : NAME,
- MAJOR : MAJOR, // deprecated
- VERSION : VERSION
- };
- UAParser.CPU = {
- ARCHITECTURE : ARCHITECTURE
- };
- UAParser.DEVICE = {
- MODEL : MODEL,
- VENDOR : VENDOR,
- TYPE : TYPE,
- CONSOLE : CONSOLE,
- MOBILE : MOBILE,
- SMARTTV : SMARTTV,
- TABLET : TABLET,
- WEARABLE: WEARABLE,
- EMBEDDED: EMBEDDED
- };
- UAParser.ENGINE = {
- NAME : NAME,
- VERSION : VERSION
- };
- UAParser.OS = {
- NAME : NAME,
- VERSION : VERSION
- };
+ UAParser.BROWSER = enumerize([NAME, VERSION, MAJOR]);
+ UAParser.CPU = enumerize([ARCHITECTURE]);
+ UAParser.DEVICE = enumerize([MODEL, VENDOR, TYPE, CONSOLE, MOBILE, SMARTTV, TABLET, WEARABLE, EMBEDDED]);
+ UAParser.ENGINE = UAParser.OS = enumerize([NAME, VERSION]);
///////////
// Export
//////////
-
// check js environment
if (typeof(exports) !== UNDEF_TYPE) {
@@ -867,11 +840,11 @@
exports.UAParser = UAParser;
} else {
// requirejs env (optional)
- if (typeof(define) === 'function' && define.amd) {
+ if (typeof(define) === FUNC_TYPE && define.amd) {
define(function () {
return UAParser;
});
- } else if (typeof window !== 'undefined') {
+ } else if (typeof window !== UNDEF_TYPE) {
// browser env
window.UAParser = UAParser;
}
@@ -882,15 +855,15 @@
// In AMD env the global scope should be kept clean, but jQuery is an exception.
// jQuery always exports to global scope, unless jQuery.noConflict(true) is used,
// and we should catch that.
- var $ = typeof window !== 'undefined' && (window.jQuery || window.Zepto);
+ var $ = typeof window !== UNDEF_TYPE && (window.jQuery || window.Zepto);
if ($ && !$.ua) {
var parser = new UAParser();
$.ua = parser.getResult();
$.ua.get = function () {
return parser.getUA();
};
- $.ua.set = function (uastring) {
- parser.setUA(uastring);
+ $.ua.set = function (ua) {
+ parser.setUA(ua);
var result = parser.getResult();
for (var prop in result) {
$.ua[prop] = result[prop];
--
Gitblit v1.8.0