Merge branch 'master' into gh-pages

This commit is contained in:
Faisalman 2012-03-08 20:16:19 +07:00
commit 25bc974ffb

View File

@ -134,8 +134,8 @@ function uaparser(uastring){
/(nintendo|playstation)\s([wids3portable]+)/i, // Nintendo/Playstation /(nintendo|playstation)\s([wids3portable]+)/i, // Nintendo/Playstation
// GNU/Linux based // GNU/Linux based
/(mint)[\s\(]?(\w+)*/i, // Mint /(mint)[\/\s\(]?(\w+)*/i, // Mint
/(joli|ubuntu|debian|suse|gentoo|arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk)[\/\s-]?([\w\.-]+)*/i, /(joli|[kxln]?ubuntu|debian|[open]*suse|gentoo|arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk)[\/\s-]?([\w\.-]+)*/i,
// Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware // Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware
// Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk
/(gnu|linux)\s?([\w\.]+)*/i // Other GNU/Linux /(gnu|linux)\s?([\w\.]+)*/i // Other GNU/Linux
@ -144,6 +144,7 @@ function uaparser(uastring){
/cros\s([\w\.\s]+)/i // Chromium OS /cros\s([\w\.\s]+)/i // Chromium OS
], [['name', 'Chromium OS'], 'version'],[ ], [['name', 'Chromium OS'], 'version'],[
// Solaris
/sunos\s?([\w\.\s]+)*/i // Solaris /sunos\s?([\w\.\s]+)*/i // Solaris
], [['name', 'Solaris'], 'version'], [ ], [['name', 'Solaris'], 'version'], [