Reorganize the structure of the code

This commit is contained in:
Faisal Salman 2012-09-15 03:48:30 +07:00
parent 33e6fe42d1
commit 68d124c59c
2 changed files with 223 additions and 206 deletions

View File

@ -1,7 +1,7 @@
{ {
"title": "UA-Parser.JS", "title": "UA-Parser.JS",
"name": "ua-parser-js", "name": "ua-parser-js",
"version": "0.3.5", "version": "0.4.0",
"author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)", "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
"description": "Lightweight JavaScript-based user-agent string parser", "description": "Lightweight JavaScript-based user-agent string parser",
"keywords": [ "keywords": [

View File

@ -1,4 +1,4 @@
// UA-Parser.JS v0.3.5 // UA-Parser.JS v0.4.0
// Lightweight JavaScript-based User-Agent string parser // Lightweight JavaScript-based User-Agent string parser
// https://github.com/faisalman/ua-parser-js // https://github.com/faisalman/ua-parser-js
// //
@ -7,15 +7,17 @@
(function (undefined) { (function (undefined) {
var regexMapper = function (ua, args) { var mapper = {
var result, i, j, k, l, m; regex : function () {
var result, i, j, k, l, m, args = arguments;
// loop through all regexes maps // loop through all regexes maps
for (i = 1; i < arguments.length; i += 2) { for (i = 0; i < args.length; i += 2) {
var regex = arguments[i], // even sequence (1,3,5,..) var regex = args[i], // odd sequence (0,2,4,..)
props = arguments[i + 1]; // odd sequence (2,4,6,..) props = args[i + 1]; // even sequence (1,3,5,..)
// construct object barebones // construct object barebones
if (typeof result === 'undefined') { if (typeof result === 'undefined') {
@ -27,14 +29,14 @@
result[props[k]] = undefined; result[props[k]] = undefined;
} }
} }
if (ua.toString() === '') { if (this.getUA().toString() === '') {
return result; return result;
} }
} }
// try matching uastring with regexes // try matching uastring with regexes
for (j = 0; j < regex.length; j++) { for (j = 0; j < regex.length; j++) {
l = regex[j].exec(ua); l = regex[j].exec(this.getUA());
if (!!l) { if (!!l) {
for (k = 0; k < props.length; k++) { for (k = 0; k < props.length; k++) {
m = l[k + 1]; m = l[k + 1];
@ -53,9 +55,10 @@
if(!!l) break; // break the loop immediately if match found if(!!l) break; // break the loop immediately if match found
} }
return result; return result;
}; },
string : function (str, map) {
var strMapper = function (str, map) {
for (var i in map) { for (var i in map) {
if (map.hasOwnProperty(i)) { if (map.hasOwnProperty(i)) {
if (typeof map[i] === 'object' && map[i].length > 0) { if (typeof map[i] === 'object' && map[i].length > 0) {
@ -70,12 +73,14 @@
} }
} }
return str; return str;
}
}; };
var maps = { var maps = {
os : { os : {
win : function (match, str1) { windows : {
return strMapper(str1, { version : function (match, str1) {
return mapper.string(str1, {
'ME' : '4.90', 'ME' : '4.90',
'NT 3.11' : 'nt3.51', 'NT 3.11' : 'nt3.51',
'NT 4.0' : 'nt4.0', 'NT 4.0' : 'nt4.0',
@ -87,15 +92,12 @@
}); });
} }
} }
}
}; };
var UAParser = function UAParser (uastring) { var regexes = {
var ua = uastring || (typeof window !== 'undefined' ? window.navigator.userAgent : ""); browser : [[
this.getBrowser = function () {
return regexMapper(ua, [
// Mixed // Mixed
/(kindle)\/((\d+)?[\w\.]+)/i, // Kindle /(kindle)\/((\d+)?[\w\.]+)/i, // Kindle
@ -130,12 +132,47 @@
// Other // Other
/(lynx|dillo|icab)[\/\s]?((\d+)?[\w\.]+)/i, // Lynx/Dillo/iCab /(lynx|dillo|icab)[\/\s]?((\d+)?[\w\.]+)/i, // Lynx/Dillo/iCab
], ['name', 'version', 'major']); ], ['name', 'version', 'major']
}; ],
this.getEngine = function () { device : [[
return regexMapper(ua, [ /\((ip[honead]+|playbook);/i, // iPod/iPhone/iPad/PlayBook
/(blackberry)[\s-]?(\w+)/i, // BlackBerry
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,
// BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
/(hp)\s([\w\s]+\w)/i, // HP iPAQ
/(hp).+(touchpad)/i, // HP TouchPad
/(kindle)\/([\w\.]+)/i, // Kindle
/(lg)[e;\s-]+(\w+)*/i, // LG
/(nintendo|playstation)\s([wids3portable]+)/i // Nintendo/Playstation
], ['name', 'version'], [
/(htc)[;_\s-]+([\w\s]+(?=\))|[\w]+)*/i, // HTC
/(zte)-([\w]+)*/i
], ['name', ['version', /_/g, ' ']], [
/\s((milestone|mz601|droid[2x]?|xoom))[globa\s]*\sbuild\//i, // Motorola
/(mot)[\s-]?(\w+)*/i
], [['name', 'Motorola'], 'version'], [
/((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i, // Samsung
/(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
/sec-((sgh\w+))/i
], [['name', 'Samsung'], 'version'], [
/((transfo[prime\s]{4,10}\s\w+))|(?:android.*)((eeepc))/i // Asus
], [['name', 'Asus'], 'version'], [
/(sie)-(\w+)*/i // Siemens
], [['name', 'Siemens'], 'version'], [
/(maemo|nokia).*(n900|lumia\s\d+)/i, // Nokia
/(nokia)[\s_-]?([\w-]+)*/i
], [['name', 'Nokia'], 'version']
],
engine : [[
/(presto)\/([\w\.]+)/i, // Presto /(presto)\/([\w\.]+)/i, // Presto
/([aple]*webkit|trident)\/([\w\.]+)/i, // Webkit/Trident /([aple]*webkit|trident)\/([\w\.]+)/i, // Webkit/Trident
@ -143,18 +180,16 @@
], ['name', 'version'], [ ], ['name', 'version'], [
/rv\:([\w\.]+).*(gecko)/i // Gecko /rv\:([\w\.]+).*(gecko)/i // Gecko
], ['version', 'name']); ], ['version', 'name']
}; ],
this.getOS = function () { os : [[
return regexMapper(ua, [
// Windows based // Windows based
/(windows\sphone\sos|windows)\s?([nt\d\.\s]+\d)/i // Windows /(windows\sphone\sos|windows)\s?([nt\d\.\s]+\d)/i // Windows
], ['name', ['version', /(.+)/gi, maps.os.win]], [ ], ['name', ['version', /(.+)/gi, 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', /(.+)/gi, maps.os.win]], [ ], [['name', 'Windows'], ['version', /(.+)/gi, maps.os.windows.version]], [
// Mobile/Embedded OS // Mobile/Embedded OS
/(blackberry).+version\/([\w\.]+)/i, // Blackberry /(blackberry).+version\/([\w\.]+)/i, // Blackberry
@ -191,50 +226,28 @@
// Other // Other
/(haiku)\s(\w+)/i, // Haiku /(haiku)\s(\w+)/i, // Haiku
/(macintosh|unix|minix|beos)[\/\s]?()*/i // UNIX/Minix/BeOS /(macintosh|unix|minix|beos)[\/\s]?()*/i // UNIX/Minix/BeOS
], ['name', 'version']); ], ['name', 'version']
]
};
var UAParser = function UAParser (uastring) {
var ua = uastring || (typeof window !== 'undefined' ? window.navigator.userAgent : "");
this.getBrowser = function () {
return mapper.regex.apply(this, regexes.browser);
}; };
this.getDevice = function () { this.getDevice = function () {
return mapper.regex.apply(this, regexes.device);
return regexMapper(ua, [
/\((ip[honead]+|playbook);/i, // iPod/iPhone/iPad/PlayBook
/(blackberry)[\s-]?(\w+)/i, // BlackBerry
/(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte)[\s_-]?([\w-]+)*/i,
// BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE
/(hp)\s([\w\s]+\w)/i, // HP iPAQ
/(hp).+(touchpad)/i, // HP TouchPad
/(kindle)\/([\w\.]+)/i, // Kindle
/(lg)[e;\s-]+(\w+)*/i, // LG
/(nintendo|playstation)\s([wids3portable]+)/i // Nintendo/Playstation
], ['name', 'version'], [
/(htc)[;_\s-]+([\w\s]+(?=\))|[\w]+)*/i, // HTC
/(zte)-([\w]+)*/i
], ['name', ['version', /_/g, ' ']], [
/\s((milestone|mz601|droid[2x]?|xoom))[globa\s]*\sbuild\//i, // Motorola
/(mot)[\s-]?(\w+)*/i
], [['name', 'Motorola'], 'version'], [
/((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i, // Samsung
/(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
/sec-((sgh\w+))/i
], [['name', 'Samsung'], 'version'], [
/((transfo[prime\s]{4,10}\s\w+))|(?:android.*)((eeepc))/i // Asus
], [['name', 'Asus'], 'version'], [
/(sie)-(\w+)*/i // Siemens
], [['name', 'Siemens'], 'version'], [
/(maemo|nokia).*(n900|lumia\s\d+)/i, // Nokia
/(nokia)[\s_-]?([\w-]+)*/i
], [['name', 'Nokia'], 'version']);
}; };
this.getUA = function() { this.getEngine = function () {
return ua; return mapper.regex.apply(this, regexes.engine);
};
this.getOS = function () {
return mapper.regex.apply(this, regexes.os);
}; };
this.getResult = function() { this.getResult = function() {
@ -246,6 +259,10 @@
}; };
}; };
this.getUA = function() {
return ua;
};
this.setUA = function (uastring) { this.setUA = function (uastring) {
ua = uastring; ua = uastring;
return this; return this;