From 675b60ebe11565f0fdc6be2b6324b5f366fb84e7 Mon Sep 17 00:00:00 2001 From: Faisalman Date: Wed, 7 Mar 2012 21:54:39 +0700 Subject: [PATCH 1/3] Add package.json --- package.json | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 package.json diff --git a/package.json b/package.json new file mode 100644 index 0000000..75bb217 --- /dev/null +++ b/package.json @@ -0,0 +1,40 @@ +{ + "title" : "UA-Parser.js", + "name" : "ua-parser-js", + "version" : "0.1.0", + "author" : { + "name" : "Faisal Salman", + "email" : "fyzlman@gmail.com", + "url" : "http://faisalman.com" + }, + "description" : "a simple user-agent string parser", + "keywords" : [ + "user-agent", + "parser", + "browser" + ], + "homepage" : "https://faisalman.github.com/ua-parser-js", + "contributors": [ + { + "name" : "Faisal Salman", + "email" : "fyzlman@gmail.com" + } + ], + "main" : "ua-parser.js", + "repositories": [ + { + "type" : "git", + "url" : "https://github.com/faisalman/ua-parser-js.git" + } + ], + "licenses" : [ + { + "type" : "GPLv2", + "url" : "http://www.gnu.org/licenses/gpl-2.0.html" + }, + { + "type" : "MIT", + "url" : "http://www.opensource.org/licenses/mit-license.php" + } + ] +} \ No newline at end of file From deac566e8c2a1576bc71b6f238ea600e2ea367b1 Mon Sep 17 00:00:00 2001 From: Faisalman Date: Wed, 7 Mar 2012 22:31:50 +0700 Subject: [PATCH 2/3] Refine some text in readme.md --- readme.md | 26 +++++++++++++++----------- ua-parser.js | 14 ++++++-------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/readme.md b/readme.md index 7afc8e5..0fe326b 100644 --- a/readme.md +++ b/readme.md @@ -1,10 +1,11 @@ -# ua-parser-js +# UA-Parser.js -Small script to extract detailed system data based on user-agent string +JavaScript-based user-agent parser * Author : Faisalman <> +* Home : http://faisalman.github.com/ua-parser-js * Source : http://github.com/faisalman/ua-parser-js -* License : GPL2 +* License : GPLv2 ## Features @@ -16,16 +17,19 @@ Get detailed type and version of web browser, layout engine, and operating syste ``` diff --git a/ua-parser.js b/ua-parser.js index 70fe16c..567038f 100644 --- a/ua-parser.js +++ b/ua-parser.js @@ -1,11 +1,9 @@ -/** - * ua-parser-js v0.1 - * Small script to extract detailed system data based on user-agent string - * http://github.com/faisalman/ua-parser-js - * - * Copyright © 2012 Faisalman - * Licensed under GPL2 http://www.gnu.org/licenses/gpl-2.0.html - */ +// UA-Parser.js v0.1.0 +// JavaScript-based user-agent parser +// https://github.com/faisalman/ua-parser-js +// +// Copyright © 2012 Faisalman +// Licensed under GPLv2 function uaparser(uastring){ From f193e7e4436b6ff620ea3749799e3c3596174ccf Mon Sep 17 00:00:00 2001 From: Faisalman Date: Thu, 8 Mar 2012 19:05:43 +0700 Subject: [PATCH 3/3] Add Macintosh, Playstation, Chrome for Android, SlimBrowser, K-Meleon, IceCat, IceApe, SwiftFox, Dillo, iCab --- ua-parser.js | 63 ++++++++++++++++++++++++++++------------------------ 1 file changed, 34 insertions(+), 29 deletions(-) diff --git a/ua-parser.js b/ua-parser.js index 567038f..057de27 100644 --- a/ua-parser.js +++ b/ua-parser.js @@ -13,10 +13,10 @@ function uaparser(uastring){ for(j = 1; j < arguments.length; j += 2){ var rx = arguments[j], asc = arguments[j+1], - k, l, m, n, o, p; - for(l = 0; l < rx.length; l++){ + k, l, m, n, o, p; + for(l = 0; l < rx.length; l++){ m = rx[l].exec(ua); - //console.log(m); + //console.log(m); if(!!m){ k = {}; o = 1; @@ -41,7 +41,7 @@ function uaparser(uastring){ if(asc.hasOwnProperty(l)){ k[asc[l]] = 'unknown'; } - }; + }; i = k; } if(p) break; @@ -66,11 +66,11 @@ function uaparser(uastring){ return arguments[1]; }; }; - + this.ua = uastring || window.navigator.userAgent; - + this.getBrowser = function(){ - + return regxMap(this.ua, [ // Mixed @@ -83,75 +83,80 @@ function uaparser(uastring){ /(opera).*\/((\d+)?[\w\.]+)/i, // Opera // Trident based - /(avant\sbrowser|iemobile)[\/\s]?((\d+)?[\w\.]+)/i, // Avant/IEMobile + /(avant\sbrowser|iemobile|slimbrowser)[\/\s]?((\d+)?[\w\.]*)/i, // Avant/IEMobile/SlimBrowser /ms(ie)\s((\d+)?[\w\.]+)/i, // Internet Explorer - + // Webkit/KHTML based /(chromium|flock|rockmelt|midori|epiphany)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany - /(chrome|omniweb|arora|dolfin)\/((\d+)?[\w\.]+)/i, // Chrome/OmniWeb/Arora/Dolphin + /(chrome|omniweb|arora|dolfin)\/((\d+)?[\w\.]+)/i, // Chrome/OmniWeb/Arora/Dolphin + ], ['name', 'release', 'version'][ + /android.+(crmo)\/((\d+)?[\w\.]+)/i, // Chrome for Android + ], [['name', /.+/g, 'Chrome'], 'release', 'version'][ /(mobile\ssafari|safari|konqueror)\/((\d+)?[\w\.]+)/i, // Safari/Konqueror /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i, - + // Gecko based /(iceweasel|camino|fennec|maemo|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i, // Iceweasel/Camino/Fennec/Maemo/Minimo - /(firefox|seamonkey|netscape|navigator)\/((\d+)?[\w\.]+)/i, // Firefox/SeaMonkey/Netscape + /(firefox|seamonkey|netscape|navigator|k-meleon|icecat|iceape|swiftfox)\/((\d+)?[\w\.]+)/i, + // Firefox/SeaMonkey/Netscape/K-Meleon/IceCat/IceApe/SwiftFox /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i, // Mozilla - + // Other - /(lynx)\/?((\d+)?[\w\.]+)/i, // Lynx + /(lynx|dillo|icab)[\/\s]?((\d+)?[\w\.]+)/i, // Lynx/Dillo/iCab ], ['name', 'release', 'version']); }; - + this.getEngine = function(){ - + return regxMap(this.ua, [ /(presto)\/([\w\.]+)/i, // Presto /([aple]*webkit|trident)\/([\w\.]+)/i, // Webkit/Trident /(khtml)\/([\w\.]+)/i // KHTML ], ['name', 'version'], [ - + /rv\:([\w\.]+).*(gecko)/i // Gecko ], ['version', 'name']); }; - + this.getOS = function(){ - + return regxMap(this.ua, [ // Windows based /(windows\sphone\sos|windows)\s+([\w\.\s]+)*/i, // Windows ], ['name', ['version', /(nt\s[\d\.]+)/gi, winMap]], [ - + // Mobile/Embedded OS /(blackberry).+version\/([\w\.]+)/i, // Blackberry - /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos)[\/\s]?([\w\.]+)*/i, + /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos)[\/\s-]?([\w\.]+)*/i, // Android/Symbian/WebOS/Palm/QNX/Bada/RIM - /(nintendo)\s([wids]+)/i, // Nintendo Wii/DS + /(nintendo|playstation)\s([wids3portable]+)/i, // Nintendo/Playstation // GNU/Linux based /(mint)[\s\(]?(\w+)*/i, // Mint - /(joli|ubuntu|debian|suse|gentoo|arch|slackware|fedora|mandriva|centos|pclinuxos|redhat)[\/\s]?([\w\.-]+)*/i, + /(joli|ubuntu|debian|suse|gentoo|arch|slackware|fedora|mandriva|centos|pclinuxos|redhat)[\/\s]?([\w\.-]+)*/i, // Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat /(gnu|linux)\s?([\w\.]+)*/i // Other GNU/Linux ], ['name', 'version'], [ - + /cros\s([\w\.\s]+)/i // Chromium OS ], [['name', 'Chromium OS'], 'version'],[ /sunos\s?([\w\.\s]+)*/i // Solaris ], [['name', 'Solaris'], 'version'], [ - + // BSD based /\s(\w*bsd|dragonfly)\s?([\w\.]+)*/i, // FreeBSD/NetBSD/OpenBSD/DragonFly ], ['name', 'version'],[ - + /(ip[honead]+).*os\s*([\w]+)*\slike\smac/i // iOS ], [['name', /.+/g, 'iOS'], ['version', /_/g, '.']], [ - - /(mac\sos)\sx\s([\w\s\.]+)/i, // Mac OS - + + /(mac\sos|macintosh)\sx\s([\w\s\.]+)/i, // Mac OS + ], ['name', ['version', /_/g, '.']], [ + // Other /(unix|minix|beos)[\/\s]?()*/i ], ['name', 'version']);