From cd3c3e7d2a54c0e8ec347a29776ee19a28fdb0a7 Mon Sep 17 00:00:00 2001 From: Simon Lang Date: Fri, 15 Aug 2014 13:01:19 +1000 Subject: [PATCH 1/3] Samsung Tablets (untested) e.g. "Mozilla/5.0 (Linux; Android 4.4.2; SM-T700 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.517 Safari/537.36" --- src/ua-parser.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index 8a8badf..a84d5f3 100644 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -479,7 +479,8 @@ /android.+\s((mz60\d|xoom[\s2]{0,2}))\sbuild\//i ], [[VENDOR, 'Motorola'], MODEL, [TYPE, TABLET]], [ - /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9|nexus 10))/i + /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9|nexus 10))/i, + /SM-T((\w+))/i ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [ // Samsung /((s[cgp]h-\w+|gt-\w+|galaxy\snexus|sm-n900))/i, /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i, From 2b4f19970ecc90700fc59ffb7f5d22e7cbb94949 Mon Sep 17 00:00:00 2001 From: Simon Lang Date: Mon, 25 Aug 2014 12:36:08 +1000 Subject: [PATCH 2/3] test for Samsung SM-T231 --- test/device-test.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/test/device-test.json b/test/device-test.json index 68dbc10..b758823 100644 --- a/test/device-test.json +++ b/test/device-test.json @@ -238,5 +238,15 @@ "model" : "Nexus 5", "type" : "mobile" } + }, + { + "desc" : "Samsung SM-T231", + "ua" : "Mozilla/5.0 (Linux; Android 4.4.2; SM-T231 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36", + "expect" : + { + "vendor" : "Samsung", + "model" : "231", + "type" : "tablet" + } } ] From 23196490027a2c79bf444fb8ca9d465d866d554f Mon Sep 17 00:00:00 2001 From: Simon Lang Date: Mon, 25 Aug 2014 13:30:18 +1000 Subject: [PATCH 3/3] include SM-T within Samsung tablet model field. add 2 more tests. --- src/ua-parser.js | 2 +- test/device-test.json | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index a84d5f3..b3b4969 100644 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -480,7 +480,7 @@ ], [[VENDOR, 'Motorola'], MODEL, [TYPE, TABLET]], [ /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9|nexus 10))/i, - /SM-T((\w+))/i + /((SM-T\w+))/i ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [ // Samsung /((s[cgp]h-\w+|gt-\w+|galaxy\snexus|sm-n900))/i, /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i, diff --git a/test/device-test.json b/test/device-test.json index b758823..a6497a8 100644 --- a/test/device-test.json +++ b/test/device-test.json @@ -245,7 +245,27 @@ "expect" : { "vendor" : "Samsung", - "model" : "231", + "model" : "SM-T231", + "type" : "tablet" + } + }, + { + "desc" : "Samsung SM-T700", + "ua" : "Mozilla/5.0 (Linux; Android 4.4.2; SM-T700 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36", + "expect" : + { + "vendor" : "Samsung", + "model" : "SM-T700", + "type" : "tablet" + } + }, + { + "desc" : "Samsung SM-T520", + "ua" : "Mozilla/5.0 (Linux; Android 4.4.2; SM-T520 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Safari/537.36", + "expect" : + { + "vendor" : "Samsung", + "model" : "SM-T520", "type" : "tablet" } }