Merge branch 'master' into gh-pages

This commit is contained in:
Faisalman 2012-08-30 02:33:53 +07:00
commit 1e1d34d897
3 changed files with 68 additions and 61 deletions

View File

@ -1,43 +1,46 @@
{ {
"title" : "UA-Parser.js", "title": "UA-Parser.js",
"name" : "ua-parser-js", "name": "ua-parser-js",
"version" : "0.3.0", "version": "0.3.1",
"author" : { "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
"name" : "Faisal Salman", "description": "Light-weight JavaScript-based all-in-one user-agent parser",
"email" : "fyzlman@gmail.com", "keywords": [
"url" : "http://faisalman.com" "user agent",
},
"description" : "Lightweight JavaScript-based user-agent parser",
"keywords" : [
"user-agent",
"parser", "parser",
"browser", "browser",
"engine", "engine",
"os", "os",
"device" "device"
], ],
"homepage" : "http://faisalman.github.com/ua-parser-js", "homepage": "http://github.com/faisalman/ua-parser-js",
"contributors": [ "contributors": [
{ "Faisal Salman <fyzlman@gmail.com>"
"name" : "Faisal Salman",
"email" : "fyzlman@gmail.com"
}
], ],
"main" : "ua-parser.js", "main": "ua-parser",
"repositories": [ "repositories": [
{ {
"type" : "git", "type": "git",
"url" : "https://github.com/faisalman/ua-parser-js.git" "url": "https://github.com/faisalman/ua-parser-js.git"
} }
], ],
"licenses" : [ "licenses": [
{ {
"type" : "GPLv2", "type": "GPLv2",
"url" : "http://www.gnu.org/licenses/gpl-2.0.html" "url": "http://www.gnu.org/licenses/gpl-2.0.html"
}, },
{ {
"type" : "MIT", "type": "MIT",
"url" : "http://www.opensource.org/licenses/mit-license.php" "url": "http://www.opensource.org/licenses/mit-license.php"
} }
] ],
"engines": {
"node": "*"
},
"directories": {
"lib": "."
},
"files": [
""
],
"repository": "git://github.com/faisalman/ua-parser-js.git"
} }

View File

@ -1,11 +1,11 @@
# UA-Parser.js # UA-Parser.js
JavaScript-based user-agent parser Light-weight JavaScript-based all-in-one user-agent parser
* Author : Faisalman <<fyzlman@gmail.com>> * Author : Faisalman <<fyzlman@gmail.com>>
* Home : http://faisalman.github.com/ua-parser-js * Home : http://faisalman.github.com/ua-parser-js
* Source : https://github.com/faisalman/ua-parser-js * Source : https://github.com/faisalman/ua-parser-js
* License : GPLv2 & MIT * License : GPLv2 & MIT
## Features ## Features
@ -29,8 +29,10 @@ Get detailed type and version of web browser, layout engine, operating system, a
<script type="text/javascript" src="ua-parser.js"></script> <script type="text/javascript" src="ua-parser.js"></script>
<script type="text/javascript"> <script type="text/javascript">
var parser = new UAParser();
// by default it takes ua string from current browser's window.navigator // by default it takes ua string from current browser's window.navigator
console.log(UAParser.result); console.log(parser.result);
/* /*
/// this will print an object structured like this: /// this will print an object structured like this:
{ {
@ -39,10 +41,6 @@ Get detailed type and version of web browser, layout engine, operating system, a
version: "", version: "",
major: "" major: ""
}, },
device: {
name: "",
version: ""
},
engine: { engine: {
name: "", name: "",
version: "" version: ""
@ -60,30 +58,30 @@ Get detailed type and version of web browser, layout engine, operating system, a
// let's test a custom user-agent string as an example // let's test a custom user-agent string as an example
var uastr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2"; var uastr = "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.2 (KHTML, like Gecko) Ubuntu/11.10 Chromium/15.0.874.106 Chrome/15.0.874.106 Safari/535.2";
UAParser.setUA(uastr); parser.setUA(uastr);
console.log(UAParser.result.browser); // {name: "Chromium", major: "15", version: "15.0.874.106"} console.log(parser.result.browser); // {name: "Chromium", major: "15", version: "15.0.874.106"}
console.log(UAParser.result.engine); // {name: "AppleWebKit", version: "535.2"} console.log(parser.result.engine); // {name: "AppleWebKit", version: "535.2"}
console.log(UAParser.result.os); // {name: "Ubuntu", version: "11.10"} console.log(parser.result.os); // {name: "Ubuntu", version: "11.10"}
// let's take another test please // let's take another test please
UAParser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getOS().name; // prints "OpenBSD" console.log(parser.setUA("Mozilla/5.0 (compatible; Konqueror/4.1; OpenBSD) KHTML/4.1.4 (like Gecko)").getOS().name); // "OpenBSD"
</script> </script>
``` ```
## Using node.js ## Using node.js
```js ```js
var parser = require('ua-parser'); var UAParser = require('ua-parser');
var parser = new UAParser();
var ua1 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11'; var ua1 = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWebKit/534.11 (KHTML, like Gecko) Version/7.1.0.7 Safari/534.11';
var ua2 = 'Midori/0.2 (X11; Linux; U; cs-cz) WebKit/531.2+'; var ua2 = 'Midori/0.2 (X11; Linux; U; cs-cz) WebKit/531.2+';
parser.setUA(ua1).getDevice().name; // prints "PlayBook" parser.setUA(ua1).getDevice().name; // "PlayBook"
parser.getOS() // prints {name: "RIM Tablet OS", version: "1.0.0"} parser.getOS() // {name: "RIM Tablet OS", version: "1.0.0"}
parser.getOS(ua2) // prints {name: "Linux", version: undefined} parser.getOS(ua2) // {name: "Linux", version: undefined}
parser.getOS() // prints {name: "RIM Tablet OS", version: "1.0.0"} parser.getOS() // {name: "RIM Tablet OS", version: "1.0.0"}
parser.getEngine().name; // prints "AppleWebKit" parser.getEngine().name; // "AppleWebKit"
``` ```
## License ## License
@ -98,4 +96,4 @@ of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details. GNU General Public License for more details.

View File

@ -1,12 +1,12 @@
// UA-Parser.js v0.3.0 // UA-Parser.js v0.3.1
// Lightweight JavaScript-based user-agent parser // Light-weight JavaScript-based all-in-one user-agent 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 // Licensed under GPLv2 & MIT
(function () { (function (undefined) {
function UAParser (uastring) { var parser = function UAParser (uastring) {
var ua = uastring || typeof window !== 'undefined' ? window.navigator.userAgent : ""; var ua = uastring || typeof window !== 'undefined' ? window.navigator.userAgent : "";
@ -97,7 +97,8 @@
// Webkit/KHTML based // Webkit/KHTML based
/(chromium|flock|rockmelt|midori|epiphany)\/((\d+)?[\w\.]+)/i, // Chromium/Flock/RockMelt/Midori/Epiphany /(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|[tizenaok]{5}\s?browser)\/((\d+)?[\w\.]+)/i,
// Chrome/OmniWeb/Arora/Dolphin/Tizen/Nokia
], ['name', 'version', 'major'], [ ], ['name', 'version', 'major'], [
/(?:android.+crmo|crios)\/((\d+)?[\w\.]+)/i, // Chrome for Android/iOS /(?:android.+crmo|crios)\/((\d+)?[\w\.]+)/i, // Chrome for Android/iOS
], [['name', 'Chrome'], 'version', 'major'], [ ], [['name', 'Chrome'], 'version', 'major'], [
@ -105,7 +106,8 @@
/(applewebkit|khtml)\/((\d+)?[\w\.]+)/i, /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i,
// Gecko based // Gecko based
/(iceweasel|camino|fennec|maemo|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i, // Iceweasel/Camino/Fennec/Maemo/Minimo /(iceweasel|camino|fennec|maemo\sbrowser|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,
// Iceweasel/Camino/Fennec/Maemo/Minimo
/(firefox|seamonkey|netscape|navigator|k-meleon|icecat|iceape)\/((\d+)?[\w\.]+)/i, /(firefox|seamonkey|netscape|navigator|k-meleon|icecat|iceape)\/((\d+)?[\w\.]+)/i,
// Firefox/SeaMonkey/Netscape/K-Meleon/IceCat/IceApe // Firefox/SeaMonkey/Netscape/K-Meleon/IceCat/IceApe
/(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i, // Mozilla /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i, // Mozilla
@ -138,8 +140,9 @@
// Mobile/Embedded OS // Mobile/Embedded OS
/(blackberry).+version\/([\w\.]+)/i, // Blackberry /(blackberry).+version\/([\w\.]+)/i, // Blackberry
/(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos)[\/\s-]?([\w\.]+)*/i, /(tizen)\/([\w\.]+)/i, // Tizen
// Android/Symbian/WebOS/Palm/QNX/Bada/RIM /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i,
// Android/Symbian/WebOS/Palm/QNX/Bada/RIM/MeeGo
/(nintendo|playstation)\s([wids3portable]+)/i, // Nintendo/Playstation /(nintendo|playstation)\s([wids3portable]+)/i, // Nintendo/Playstation
// GNU/Linux based // GNU/Linux based
@ -168,7 +171,8 @@
], ['name', ['version', /_/g, '.']], [ ], ['name', ['version', /_/g, '.']], [
// Other // Other
/(macintosh|unix|minix|beos)[\/\s]?()*/i /(haiku)\s(\w+)/i, // Haiku
/(macintosh|unix|minix|beos)[\/\s]?()*/i // UNIX/Minix/BeOS
], ['name', 'version']); ], ['name', 'version']);
}; };
@ -178,8 +182,8 @@
/\((ip[honead]+|playbook);/i, // iPod/iPhone/iPad/PlayBook /\((ip[honead]+|playbook);/i, // iPod/iPhone/iPad/PlayBook
/(blackberry)[\s-]?(\w+)/i, // BlackBerry /(blackberry)[\s-]?(\w+)/i, // BlackBerry
/(blackberry|benq|nokia|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i, /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,
// BenQ/Nokia/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]+)/i, // HP iPAQ
/(hp).+(touchpad)/i, // HP TouchPad /(hp).+(touchpad)/i, // HP TouchPad
/(kindle)\/([\w\.]+)/i, // Kindle /(kindle)\/([\w\.]+)/i, // Kindle
@ -204,7 +208,11 @@
], [['name', 'Asus'], 'version'], [ ], [['name', 'Asus'], 'version'], [
/sie-(\w+)*/i // Siemens /sie-(\w+)*/i // Siemens
], [['name', 'Siemens'], 'version']); ], [['name', 'Siemens'], 'version'], [
/(?=maemo|nokia).*(n900|lumia\s\d+)/i, // Nokia
/nokia[\s_-]?([\w-]+)*/i
], [['name', 'Nokia'], 'version']);
}; };
this.setUA = function (uastring) { this.setUA = function (uastring) {
@ -220,9 +228,7 @@
this.setUA(ua); this.setUA(ua);
}; };
var parser = new UAParser();
// check whether script is running inside node.js export as module // check whether script is running inside node.js export as module
if (typeof exports !== 'undefined' && this.toString() !== '[object DOMWindow]') { if (typeof exports !== 'undefined' && this.toString() !== '[object DOMWindow]') {
if (typeof module !== 'undefined' && module.exports) { if (typeof module !== 'undefined' && module.exports) {