github_mirrors/ua-parser-js
3
0
Fork 1
mirror of https://github.com/faisalman/ua-parser-js.git synced 2025-09-27 16:08:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Move extend function inside util

Browse Source
This commit is contained in:
Faisal Salman 2014-10-14 23:06:59 +07:00
parent 309ec34951
commit 381bbea845
1 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ua-parser.js
View File

@ -38,6 +38,14 @@
var util = { var util = {
extend : function (regexes, extensions) {
for (var i in extensions) {
if ("browser cpu device engine os".indexOf(i) !== -1 && extensions[i].length % 2 == 0) {
regexes[i] = regexes[i].concat(extensions[i]);
}
}
return regexes;
},
has : function (str1, str2) { has : function (str1, str2) {
if (typeof str1 === "string") { if (typeof str1 === "string") {
return str2.toLowerCase().indexOf(str1.toLowerCase()) !== -1; return str2.toLowerCase().indexOf(str1.toLowerCase()) !== -1;
@ -600,18 +608,6 @@
] ]
}; };
/**
* Extends the regex array with another regex array from a given input array
* @param {object} extensions extension objects that contains an array under the given paramName
* @param {string} paramName key of the extensions object that should be used if given.
*/
function extend(extensions, paramName) {
if (!extensions || !extensions[paramName] || extensions[paramName].length%2!==0) {
return;
}
regexes[paramName] = regexes[paramName].concat(extensions[paramName]);
}
///////////////// /////////////////
// Constructor // Constructor
@ -620,33 +616,27 @@
var UAParser = function (uastring, extensions) { var UAParser = function (uastring, extensions) {
var ua = uastring || ((window && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
if (!(this instanceof UAParser)) { if (!(this instanceof UAParser)) {
return new UAParser(uastring, extensions).getResult(); return new UAParser(uastring, extensions).getResult();
} }
// extend regexes var ua = uastring || ((window && window.navigator && window.navigator.userAgent) ? window.navigator.userAgent : EMPTY);
extend(extensions, 'browser'); var rgxmap = extensions ? util.extend(regexes, extensions) : regexes;
extend(extensions, 'cpu');
extend(extensions, 'device');
extend(extensions, 'engine');
extend(extensions, 'os');
this.getBrowser = function () { this.getBrowser = function () {
return mapper.rgx.apply(this, regexes.browser); return mapper.rgx.apply(this, rgxmap.browser);
}; };
this.getCPU = function () { this.getCPU = function () {
return mapper.rgx.apply(this, regexes.cpu); return mapper.rgx.apply(this, rgxmap.cpu);
}; };
this.getDevice = function () { this.getDevice = function () {
return mapper.rgx.apply(this, regexes.device); return mapper.rgx.apply(this, rgxmap.device);
}; };
this.getEngine = function () { this.getEngine = function () {
return mapper.rgx.apply(this, regexes.engine); return mapper.rgx.apply(this, rgxmap.engine);
}; };
this.getOS = function () { this.getOS = function () {
return mapper.rgx.apply(this, regexes.os); return mapper.rgx.apply(this, rgxmap.os);
}; };
this.getResult = function() { this.getResult = function() {
return { return {
@ -675,6 +665,7 @@
UAParser.ARCHITECTURE = ARCHITECTURE; UAParser.ARCHITECTURE = ARCHITECTURE;
UAParser.MAJOR = MAJOR; UAParser.MAJOR = MAJOR;
/////////// ///////////
// Export // Export
////////// //////////