Make variable name less cryptic

This commit is contained in:
Faisalman 2012-03-20 16:20:50 +07:00
parent 4a6470b707
commit 8ba7e75476

View File

@ -1,4 +1,4 @@
// UA-Parser.js v0.1.0 // UA-Parser.js v0.1.1
// Lightweight JavaScript-based user-agent parser // Lightweight JavaScript-based user-agent parser
// https://github.com/faisalman/ua-parser-js // https://github.com/faisalman/ua-parser-js
// //
@ -9,49 +9,49 @@ function uaparser(uastring){
// regexp mapper // regexp mapper
var regxMap = function (ua) { var regxMap = function (ua) {
var i, j; var result;
for(j = 1; j < arguments.length; j += 2){ var i, j, k, l;
var rx = arguments[j], for (i = 1; i < arguments.length; i += 2) {
asc = arguments[j+1], var regex = arguments[i];
k, l, m, n, o, p; var props = arguments[i + 1];
for(l = 0; l < rx.length; l++){ var isMatch = false;
m = rx[l].exec(ua); for (j = 0; j < regex.length; j++) {
//console.log(m); var match = regex[j].exec(ua);
if(!!m){ //console.log(match);
k = {}; if (!!match) {
o = 1; result = {};
for(n = 0; n < asc.length; n++){ l = 1;
if(typeof asc[n] === 'object' && asc[n].length === 2){ for (k = 0; k < props.length; k++) {
k[asc[n][0]] = asc[n][1]; if (typeof props[k] === 'object' && props[k].length === 2) {
o -= 1; result[props[k][0]] = props[k][1];
} else if(typeof asc[n] === 'object' && asc[n].length === 3){ l -= 1;
k[asc[n][0]] = (!!m[n+o]) ? m[n+o].replace(asc[n][1], asc[n][2]) : 'unknown'; } else if (typeof props[k] === 'object' && props[k].length === 3) {
result[props[k][0]] = (!!match[k + l]) ? match[k + l].replace(props[k][1], props[k][2]) : 'unknown';
} else { } else {
k[asc[n]] = (!!m[n+o]) ? m[n+o] : 'unknown'; result[props[k]] = (!!match[k + l]) ? match[k + l] : 'unknown';
} }
}; };
i = k; isMatch = true;
p = true;
break; break;
} }
}; };
if(!p){ if (!isMatch) {
k = {}; result = {};
for(l in asc){ for (j in props) {
if(asc.hasOwnProperty(l)){ if (props.hasOwnProperty(j)) {
k[asc[l]] = 'unknown'; result[props[j]] = 'unknown';
} }
}; };
i = k; } else {
break;
} }
if(p) break;
}; };
return i; return result;
}; };
var mapper = { var mapper = {
win : function(){ win: function (str, match) {
switch(arguments[1].toLowerCase()){ switch (match.toLowerCase()) {
case 'nt 5.0': case 'nt 5.0':
return '2000'; return '2000';
case 'nt 5.1': case 'nt 5.1':
@ -64,7 +64,7 @@ function uaparser(uastring){
case 'nt 6.2': case 'nt 6.2':
return '8'; return '8';
default: default:
return arguments[1]; return match;
}; };
} }
}; };
@ -77,7 +77,7 @@ function uaparser(uastring){
// Mixed // Mixed
/(kindle)\/((\d+)?[\w\.]+)/i, // Kindle /(kindle)\/((\d+)?[\w\.]+)/i, // Kindle
/(lunascape|maxthon|netfront|jasmine)[\/\s]?((\d+)?[\w\.]+)/i, // Lunascape/Maxthon/Netfront/Jasmine /(lunpropsape|maxthon|netfront|jasmine)[\/\s]?((\d+)?[\w\.]+)/i, // Lunpropsape/Maxthon/Netfront/Jasmine
// Presto based // Presto based
/(opera\smini)\/((\d+)?[\w\.-]+)/i, // Opera Mini /(opera\smini)\/((\d+)?[\w\.-]+)/i, // Opera Mini