Moved windows version mapper function inside mapper object

This commit is contained in:
Faisalman 2012-03-20 15:31:05 +07:00
parent b918d9638f
commit 4a6470b707
2 changed files with 22 additions and 20 deletions

View File

@ -7,13 +7,13 @@
"email" : "fyzlman@gmail.com", "email" : "fyzlman@gmail.com",
"url" : "http://faisalman.com" "url" : "http://faisalman.com"
}, },
"description" : "a simple user-agent string parser", "description" : "Lightweight JavaScript-based user-agent parser",
"keywords" : [ "keywords" : [
"user-agent", "user-agent",
"parser", "parser",
"browser" "browser"
], ],
"homepage" : "https://faisalman.github.com/ua-parser-js", "homepage" : "http://faisalman.github.com/ua-parser-js",
"contributors": [ "contributors": [
{ {
"name" : "Faisal Salman", "name" : "Faisal Salman",

View File

@ -1,5 +1,5 @@
// UA-Parser.js v0.1.0 // UA-Parser.js v0.1.0
// 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
// //
// Copyright © 2012 Faisalman // Copyright © 2012 Faisalman
@ -49,22 +49,24 @@ function uaparser(uastring){
return i; return i;
}; };
var winMap = function(){ var mapper = {
switch(arguments[1].toLowerCase()){ win : function(){
case 'nt 5.0': switch(arguments[1].toLowerCase()){
return '2000'; case 'nt 5.0':
case 'nt 5.1': return '2000';
case 'nt 5.2': case 'nt 5.1':
return 'XP'; case 'nt 5.2':
case 'nt 6.0': return 'XP';
return 'Vista'; case 'nt 6.0':
case 'nt 6.1': return 'Vista';
return '7'; case 'nt 6.1':
case 'nt 6.2': return '7';
return '8'; case 'nt 6.2':
default: return '8';
return arguments[1]; default:
}; return arguments[1];
};
}
}; };
this.ua = uastring || window.navigator.userAgent; this.ua = uastring || window.navigator.userAgent;
@ -125,7 +127,7 @@ function uaparser(uastring){
// Windows based // Windows based
/(windows\sphone\sos|windows)\s+([\w\.\s]+)*/i, // Windows /(windows\sphone\sos|windows)\s+([\w\.\s]+)*/i, // Windows
], ['name', ['version', /(nt\s[\d\.]+)/gi, winMap]], [ ], ['name', ['version', /(nt\s[\d\.]+)/gi, mapper.win]], [
// Mobile/Embedded OS // Mobile/Embedded OS
/(blackberry).+version\/([\w\.]+)/i, // Blackberry /(blackberry).+version\/([\w\.]+)/i, // Blackberry