github_mirrors/ua-parser-js
3
0
Fork 1
mirror of https://github.com/faisalman/ua-parser-js.git synced 2025-09-27 16:08:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Some fixes

Browse Source
This commit is contained in:
Faisal Salman 2012-09-22 00:06:50 +07:00
parent 3f92a3cb10
commit 59270c8cf7
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ua-parser.js
View File

@ -103,17 +103,17 @@
browser : [[ browser : [[
// Mixed
/(kindle)\/((\d+)?[\w\.]+)/i, // Kindle
/(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)/i,
// Lunascape/Maxthon/Netfront/Jasmine/Blazer
// Presto based // Presto based
/(opera\smini)\/((\d+)?[\w\.-]+)/i, // Opera Mini /(opera\smini)\/((\d+)?[\w\.-]+)/i, // Opera Mini
/(opera\smobi)\/((\d+)?[\w\.-]+)/i, // Opera Mobile /(opera\smobi)\/((\d+)?[\w\.-]+)/i, // Opera Mobile
/(opera).+version\/((\d+)?[\w\.]+)/i, // Opera > 9.80 /(opera).+version\/((\d+)?[\w\.]+)/i, // Opera > 9.80
/(opera)[\/\s]+((\d+)?[\w\.]+)/i, // Opera < 9.80 /(opera)[\/\s]+((\d+)?[\w\.]+)/i, // Opera < 9.80
// Mixed
/(kindle)\/((\d+)?[\w\.]+)/i, // Kindle
/(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)/i,
// Lunascape/Maxthon/Netfront/Jasmine/Blazer
// Trident based // Trident based
/(avant\sbrowser|iemobile|slimbrowser)[\/\s]?((\d+)?[\w\.]*)/i, // Avant/IEMobile/SlimBrowser /(avant\sbrowser|iemobile|slimbrowser)[\/\s]?((\d+)?[\w\.]*)/i, // Avant/IEMobile/SlimBrowser
/ms(ie)\s((\d+)?[\w\.]+)/i, // Internet Explorer /ms(ie)\s((\d+)?[\w\.]+)/i, // Internet Explorer
@ -144,16 +144,17 @@
device : [[ device : [[
/\(((ip[honead]+|playbook));/i, // iPod/iPhone/iPad/PlayBook /\(((ipad|playbook));/i, // iPad/PlayBook
/(hp).+(touchpad)/i, // HP TouchPad /(hp).+(touchpad)/i, // HP TouchPad
/(kindle)\/([\w\.]+)/i, // Kindle /(kindle)\/([\w\.]+)/i, // Kindle
/\s(nook)[\w\s]+build\/(\w+)/i, // Nook /\s(nook)[\w\s]+build\/(\w+)/i, // Nook
/(dell)\s(strea[kpr\s\d]*[\dko])/i // Dell Streak /(dell)\s(strea[kpr\s\d]*[\dko])/i // Dell Streak
], ['vendor', 'model', ['type', 'Tablet']], [ ], ['vendor', 'model', ['type', 'Tablet']], [
/\(((ip[honed]+));/i, // iPod/iPhone
/(blackberry)[\s-]?(\w+)/i, // BlackBerry /(blackberry)[\s-]?(\w+)/i, // BlackBerry
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|huawei|meizu)[\s_-]?([\w-]+)*/i, /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|huawei|meizu|motorola)[\s_-]?([\w-]+)*/i,
// BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/Huawei/Meizu // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Huawei/Meizu/Motorola
/(hp)\s([\w\s]+\w)/i, // HP iPAQ /(hp)\s([\w\s]+\w)/i, // HP iPAQ
/(asus)-?(\w+)/i // Asus /(asus)-?(\w+)/i // Asus
], ['vendor', 'model', ['type', 'Mobile']], [ ], ['vendor', 'model', ['type', 'Mobile']], [
@ -195,14 +196,14 @@
/android\s3\.[\s\w-;]{10}(lg?)-([06cv9]{3,4})/i // LG /android\s3\.[\s\w-;]{10}(lg?)-([06cv9]{3,4})/i // LG
], [['vendor', 'LG'], 'model', ['type', 'Tablet']], [ ], [['vendor', 'LG'], 'model', ['type', 'Tablet']], [
/(lg)[e;\s-]+(\w+)*/i /(lg)[e;\s-\/]+(\w+)*/i
], [['vendor', 'LG'], 'model', ['type', 'Mobile']] ], [['vendor', 'LG'], 'model', ['type', 'Mobile']]
], ],
engine : [[ engine : [[
/(presto)\/([\w\.]+)/i, // Presto /(presto)\/([\w\.]+)/i, // Presto
/([aple]*webkit|trident)\/([\w\.]+)/i, // Webkit/Trident /([aple]*webkit|trident|netfront)\/([\w\.]+)/i, // Webkit/Trident/NetFront
/(khtml)\/([\w\.]+)/i // KHTML /(khtml)\/([\w\.]+)/i // KHTML
], ['name', 'version'], [ ], ['name', 'version'], [
@ -213,7 +214,7 @@
os : [[ os : [[
// Windows based // Windows based
/(windows\sphone\sos|windows)\s?([ntce\d\.\s]+\d)/i // Windows /(windows\sphone\sos|windows\s?[mobile]*)[\s\/]?([ntce\d\.\s]+\w)/i // Windows
], ['name', ['version', mapper.string, maps.os.windows.version]], [ ], ['name', ['version', mapper.string, maps.os.windows.version]], [
/(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
], [['name', 'Windows'], ['version', mapper.string, maps.os.windows.version]], [ ], [['name', 'Windows'], ['version', mapper.string, maps.os.windows.version]], [
@ -221,8 +222,12 @@
// Mobile/Embedded OS // Mobile/Embedded OS
/(blackberry).+version\/([\w\.]+)/i, // Blackberry /(blackberry).+version\/([\w\.]+)/i, // Blackberry
/(tizen)\/([\w\.]+)/i, // Tizen /(tizen)\/([\w\.]+)/i, // Tizen
/(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i, /(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i
// Android/Symbian/WebOS/Palm/QNX/Bada/RIM/MeeGo // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo
], ['name', 'version'], [
/(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]+)*/i // Symbian
], [['name', 'Symbian'], 'version'],[
/(nintendo|playstation)\s([wids3portable]+)/i, // Nintendo/Playstation /(nintendo|playstation)\s([wids3portable]+)/i, // Nintendo/Playstation
// GNU/Linux based // GNU/Linux based
@ -233,7 +238,7 @@
/(gnu|linux)\s?([\w\.]+)*/i // Other GNU/Linux /(gnu|linux)\s?([\w\.]+)*/i // Other GNU/Linux
], ['name', 'version'], [ ], ['name', 'version'], [
/(cros)\s([\w\.\s]+\d)/i // Chromium OS /(cros)\s[\w]+\s([\w\.]+\w)/i // Chromium OS
], [['name', 'Chromium OS'], 'version'],[ ], [['name', 'Chromium OS'], 'version'],[
// Solaris // Solaris