From 7568f0a6f53b0bb8b042a2503da47e2dc06303e5 Mon Sep 17 00:00:00 2001 From: Masahiko Sato Date: Mon, 20 Jan 2020 17:15:57 +0900 Subject: [PATCH] Updated the regexp patterns to be simpler/safer. --- src/ua-parser.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index 920a1ee..a9e6c53 100755 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -667,13 +667,11 @@ /android.+(Gigaset)[\s\-]+(Q\w{1,9})\s+build/i // Gigaset Tablets ], [VENDOR, MODEL, [TYPE, TABLET]], [ - // Android Phones from Unidentified Vendors - /android .+?;\s([^;]+?)(?:\sbuild.+?)?\) applewebkit.+?\smobile\ssafari/i + /android .+?; ([^;]+?)(?: build|\) applewebkit).+? mobile safari/i ], [MODEL, [TYPE, MOBILE]], [ - // Android Tablets from Unidentified Vendors - /android .+?;\s([^;]+?)(?:\sbuild.+?)?\) applewebkit.+?(?!\smobile)\ssafari/i + /android .+?;\s([^;]+?)(?: build|\) applewebkit).+?(?! mobile) safari/i ], [MODEL, [TYPE, TABLET]], [ /\s(tablet|tab)[;\/]/i, // Unidentifiable Tablet