From 615d6a2034b39f7fbb3a88c771b8e2ed1d7c6ba0 Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Tue, 5 Mar 2013 21:05:38 +0700 Subject: [PATCH] Add new Webkit Opera --- package.json | 2 +- test.js | 10 ++++++++++ ua-parser-js.jquery.json | 2 +- ua-parser.js | 7 ++++++- ua-parser.min.js | 4 ++-- 5 files changed, 20 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 293ec21..1efe88a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "title": "UA-Parser.JS", "name": "ua-parser-js", - "version": "0.5.14", + "version": "0.5.15", "author": "Faisal Salman (http://faisalman.com)", "description": "Lightweight JavaScript-based user-agent string parser", "keywords": [ diff --git a/test.js b/test.js index a68714a..9969d02 100644 --- a/test.js +++ b/test.js @@ -462,6 +462,16 @@ var browsers = [ major : '11' } }, + { + desc : 'Opera Webkit', + ua : 'Mozilla/5.0 AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.123 Mobile Safari/537.22 OPR/14.0.1025.52315', + expect : + { + name : 'Opera', + version : '14.0.1025.52315', + major : '14' + } + }, { desc : 'Opera Mini', ua : 'Opera/9.80 (J2ME/MIDP; Opera Mini/5.1.21214/19.916; U; en) Presto/2.5.25', diff --git a/ua-parser-js.jquery.json b/ua-parser-js.jquery.json index deba482..ec3ba8b 100644 --- a/ua-parser-js.jquery.json +++ b/ua-parser-js.jquery.json @@ -1,7 +1,7 @@ { "title": "UA-Parser.JS", "name": "ua-parser-js", - "version": "0.5.14", + "version": "0.5.15", "description": "Lightweight JavaScript-based user-agent string parser", "keywords": [ "user-agent", diff --git a/ua-parser.js b/ua-parser.js index 1f1b7c7..bf117d7 100644 --- a/ua-parser.js +++ b/ua-parser.js @@ -1,4 +1,4 @@ -// UA-Parser.JS v0.5.14 +// UA-Parser.JS v0.5.15 // Lightweight JavaScript-based User-Agent string parser // https://github.com/faisalman/ua-parser-js // @@ -156,6 +156,11 @@ /(opera\s[mobiletab]+).+version\/((\d+)?[\w\.-]+)/i, // Opera Mobi/Tablet /(opera).+version\/((\d+)?[\w\.]+)/i, // Opera > 9.80 /(opera)[\/\s]+((\d+)?[\w\.]+)/i, // Opera < 9.80 + + ], [NAME, VERSION, MAJOR], [ + + /\s(opr)\/((\d+)?[\w\.]+)/i // Opera Webkit + ], [[NAME, 'Opera'], VERSION, MAJOR], [ // Mixed /(kindle)\/((\d+)?[\w\.]+)/i, // Kindle diff --git a/ua-parser.min.js b/ua-parser.min.js index 72de99c..d2510fa 100644 --- a/ua-parser.min.js +++ b/ua-parser.min.js @@ -1,7 +1,7 @@ -// UA-Parser.JS v0.5.14 +// UA-Parser.JS v0.5.15 // Lightweight JavaScript-based User-Agent string parser // https://github.com/faisalman/ua-parser-js // // Copyright © 2012-2013 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