From e0b6ae65e5e3029e78047989c3a62d583863828c Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Mon, 28 Jan 2013 17:06:30 +0700 Subject: [PATCH] Better fix for issue #8 --- ua-parser.js | 12 ++++++++---- ua-parser.min.js | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ua-parser.js b/ua-parser.js index 3091193..ab16f46 100644 --- a/ua-parser.js +++ b/ua-parser.js @@ -119,9 +119,12 @@ }, device : { - htc : { + sprint : { model : { 'Evo Shift 4G' : '7373KT' + }, + vendor : { + 'HTC' : 'APA' } } }, @@ -244,8 +247,9 @@ /(nintendo|playstation)\s([wids3portablev]+)/i // Nintendo/Playstation ], [VENDOR, MODEL, [TYPE, CONSOLE]], [ - /(sprint\sapa)(\w+)/i - ], [[VENDOR, 'HTC'], [MODEL, mapper.string, maps.device.htc.model], [TYPE, MOBILE]], [ + /(sprint\s[a-z]+)(\w+)/i // Sprint Phones + ], [[VENDOR, mapper.string, maps.device.sprint.vendor], [MODEL, mapper.string, maps.device.sprint.model], [TYPE, MOBILE]], [ + /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i, // HTC /(zte)-(\w+)*/i // ZTE @@ -258,7 +262,7 @@ ], [[VENDOR, 'Motorola'], MODEL, [TYPE, TABLET]], [ /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9))/i - ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [ // Samsung + ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [ // Samsung /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i, /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i, /sec-((sgh\w+))/i diff --git a/ua-parser.min.js b/ua-parser.min.js index 8404e78..719643f 100644 --- a/ua-parser.min.js +++ b/ua-parser.min.js @@ -4,4 +4,4 @@ // // 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