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

Move regexMapper & maps outside UAParser class

Browse Source
This commit is contained in:
Faisal Salman 2012-09-15 01:26:50 +07:00
parent 064d52255f
commit 65703e7c1a
2 changed files with 90 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

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

40
ua-parser.js
View File

@ -1,4 +1,4 @@
// UA-Parser.JS v0.3.3
// UA-Parser.JS v0.3.4
// Lightweight JavaScript-based User-Agent string parser
// https://github.com/faisalman/ua-parser-js
//
@ -6,20 +6,16 @@
// Dual licensed under GPLv2 & MIT
(function (undefined) {
var parser = function UAParser (uastring) {
var ua = uastring || (typeof window !== 'undefined' ? window.navigator.userAgent : "");
// regexp mapper
var regxMap = function (args) {
var regexMapper = function (ua, args) {
var result = {}, i, j, k, l, m;
// loop through all regexes maps
for (i = 0; i < arguments.length; i += 2) {
for (i = 1; i < arguments.length; i += 2) {
var regex = arguments[i], // odd sequence (0,2,4,..)
props = arguments[i + 1]; // even sequence (1,3,5,..)
var regex = arguments[i], // even sequence (1,3,5,..)
props = arguments[i + 1]; // odd sequence (2,4,6,..)
// build object barebones
for (k = 0; k < props.length; k++) {
@ -53,7 +49,7 @@
return result;
};
var mapper = {
var maps = {
check : function(str, map){
for (var i in map){
@ -74,7 +70,7 @@
os : {
win : function (match, str1) {
return mapper.check(str1, {
return maps.check(str1, {
'ME' : '4.90',
'NT 3.11' : 'nt3.51',
'NT 4.0' : 'nt4.0',
@ -88,9 +84,13 @@
}
};
var UAParser = function UAParser (uastring) {
var ua = uastring || (typeof window !== 'undefined' ? window.navigator.userAgent : "");
this.getBrowser = function () {
return regxMap([
return regexMapper(ua, [
// Mixed
/(kindle)\/((\d+)?[\w\.]+)/i, // Kindle
@ -130,7 +130,7 @@
this.getEngine = function () {
return regxMap([
return regexMapper(ua, [
/(presto)\/([\w\.]+)/i, // Presto
/([aple]*webkit|trident)\/([\w\.]+)/i, // Webkit/Trident
@ -143,13 +143,13 @@
this.getOS = function () {
return regxMap([
return regexMapper(ua, [
// Windows based
/(windows\sphone\sos|windows)\s?([nt\d\.\s]+\d)/i // Windows
], ['name', ['version', /(.+)/gi, mapper.os.win]], [
], ['name', ['version', /(.+)/gi, maps.os.win]], [
/(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
], [['name', 'Windows'], ['version', /(.+)/gi, mapper.os.win]], [
], [['name', 'Windows'], ['version', /(.+)/gi, maps.os.win]], [
// Mobile/Embedded OS
/(blackberry).+version\/([\w\.]+)/i, // Blackberry
@ -191,7 +191,7 @@
this.getDevice = function () {
return regxMap([
return regexMapper(ua, [
/\((ip[honead]+|playbook);/i, // iPod/iPhone/iPad/PlayBook
/(blackberry)[\s-]?(\w+)/i, // BlackBerry
@ -252,10 +252,10 @@
// check whether script is running inside node.js export as module
if (typeof exports !== 'undefined' && this.toString() !== '[object DOMWindow]') {
if (typeof module !== 'undefined' && module.exports) {
exports = module.exports = parser;
exports = module.exports = UAParser;
}
exports.UAParser = parser;
exports.UAParser = UAParser;
} else {
this['UAParser'] = parser;
this['UAParser'] = UAParser;
}
})();