From a6610646ca1799bdcca7f901e3c94528ec18ec24 Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Sun, 23 Dec 2012 06:45:59 +0700 Subject: [PATCH] Fix issue #7 --- package.json | 2 +- test.js | 17 +++++++++++++---- ua-parser.js | 4 ++-- ua-parser.min.js | 4 ++-- 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 829bd09..91e26bf 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "UA-Parser.JS", "name": "ua-parser-js", - "version": "0.4.18", + "version": "0.5.0", "author": "Faisal Salman (http://faisalman.com)", "description": "Lightweight JavaScript-based user-agent string parser", "keywords": [ diff --git a/test.js b/test.js index 7036a74..25395b2 100644 --- a/test.js +++ b/test.js @@ -1122,12 +1122,21 @@ var os = [ } }, { - desc : 'iOS', - ua : '', + desc : 'iOS with Chrome', + ua : 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 5_1_1 like Mac OS X; en) AppleWebKit/534.46.0 (KHTML, like Gecko) CriOS/19.0.1084.60 Mobile/9B206 Safari/7534.48.3', expect : { - name : '', - version : '' + name : 'iOS', + version : '5.1.1' + } + }, + { + desc : 'iOS with Opera Mini', + ua : 'Opera/9.80 (iPhone; Opera Mini/7.1.32694/27.1407; U; en) Presto/2.8.119 Version/11.10', + expect : + { + name : 'iOS', + version : undefined } }, { diff --git a/ua-parser.js b/ua-parser.js index 36c112e..34262aa 100644 --- a/ua-parser.js +++ b/ua-parser.js @@ -1,4 +1,4 @@ -// UA-Parser.JS v0.4.18 +// UA-Parser.JS v0.5.0 // Lightweight JavaScript-based User-Agent string parser // https://github.com/faisalman/ua-parser-js // @@ -329,7 +329,7 @@ /\s(\w*bsd|dragonfly)\s?([\w\.]+)*/i, // FreeBSD/NetBSD/OpenBSD/DragonFly ], [NAME, VERSION],[ - /(ip[honead]+).*os\s*([\w]+)*\slike\smac/i // iOS + /(ip[honead]+)(?:.*os\s*([\w]+)*\slike\smac|;\sopera)/i, // iOS ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [ /(mac\sos\sx)\s?([\w\s\.]+\w)*/i, // Mac OS diff --git a/ua-parser.min.js b/ua-parser.min.js index 57c5b7b..6ff9010 100644 --- a/ua-parser.min.js +++ b/ua-parser.min.js @@ -1,7 +1,7 @@ -// UA-Parser.JS v0.4.18 +// UA-Parser.JS v0.5.0 // Lightweight JavaScript-based User-Agent string parser // https://github.com/faisalman/ua-parser-js // // Copyright © 2012 Faisalman // Dual licensed under GPLv2 & MIT -(function(e,t){"use strict";var n="",r="function",i="undefined",s="object",o="major",u="model",a="name",f="type",l="vendor",c="version",h="console",p="mobile",d="tablet",v={regex:function(){var e,o,u,a,f,l,c=arguments;for(o=0;o0){for(var o=0;o0){for(var o=0;o