Changed property name browser.release to browser.major

This commit is contained in:
Faisalman 2012-03-20 16:36:51 +07:00
parent 8ba7e75476
commit 0276dd0c49
2 changed files with 25 additions and 6 deletions

View File

@ -17,8 +17,27 @@ Get detailed type and version of web browser, layout engine, and operating syste
<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 window.navigator var parser = new uaparser(); // if no string given as parameter, by default it takes ua string from current window.navigator
console.log(parser.getBrowser()); // this will print an object contains current browser info
console.log(parser);
/*
/// this will print an object structured like this:
{
browser: {
name: "",
major: "",
version: ""
},
engine: {
name: "",
version: ""
},
os: {
name: "",
version: ""
}
}
*/
// let's test a custom user-agent string as an example // let's test a custom user-agent string as an example
parser.ua = "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"; parser.ua = "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";
@ -27,7 +46,7 @@ Get detailed type and version of web browser, layout engine, and operating syste
var engine = parser.getEngine(); var engine = parser.getEngine();
var os = parser.getOS(); var os = parser.getOS();
console.log(browser); // {name: "Chromium", version: "15.0.874.106"} console.log(browser); // {name: "Chromium", major: "15", version: "15.0.874.106"}
console.log(engine); // {name: "AppleWebKit", version: "535.2"} console.log(engine); // {name: "AppleWebKit", version: "535.2"}
console.log(os); // {name: "Ubuntu", version: "11.10"} console.log(os); // {name: "Ubuntu", version: "11.10"}

View File

@ -91,9 +91,9 @@ function uaparser (uastring) {
// 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)\/((\d+)?[\w\.]+)/i, // Chrome/OmniWeb/Arora/Dolphin
], ['name', 'release', 'version'], [ ], ['name', 'version', 'major'], [
/android.+(crmo)\/((\d+)?[\w\.]+)/i, // Chrome for Android /android.+(crmo)\/((\d+)?[\w\.]+)/i, // Chrome for Android
], [['name', /.+/g, 'Chrome'], 'release', 'version'], [ ], [['name', /.+/g, 'Chrome'], 'version', 'major'], [
/(mobile\ssafari|safari|konqueror)\/((\d+)?[\w\.]+)/i, // Safari/Konqueror /(mobile\ssafari|safari|konqueror)\/((\d+)?[\w\.]+)/i, // Safari/Konqueror
/(applewebkit|khtml)\/((\d+)?[\w\.]+)/i, /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i,
@ -105,7 +105,7 @@ function uaparser (uastring) {
// Other // Other
/(lynx|dillo|icab)[\/\s]?((\d+)?[\w\.]+)/i, // Lynx/Dillo/iCab /(lynx|dillo|icab)[\/\s]?((\d+)?[\w\.]+)/i, // Lynx/Dillo/iCab
], ['name', 'release', 'version']); ], ['name', 'version', 'major']);
}; };
this.getEngine = function() { this.getEngine = function() {