diff --git a/src/ua-parser.js b/src/ua-parser.js index 567517c..350425d 100644 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -83,7 +83,7 @@ rgx : function (ua, arrays) { - //var result = {}, + //var result = {}, var i = 0, j, k, p, q, matches, match;//, args = arguments; /*// construct object barebones @@ -273,6 +273,9 @@ /(micromessenger)\/([\w\.]+)/i // WeChat ], [[NAME, 'WeChat'], VERSION], [ + /(QQ)\/([\d\.]+)/i // QQ, aka ShouQ + ], [NAME, VERSION], [ + /m?(qqbrowser)[\/\s]?([\w\.]+)/i // QQBrowser ], [NAME, VERSION], [ diff --git a/test/browser-test.json b/test/browser-test.json index da8623d..f3b8c3e 100644 --- a/test/browser-test.json +++ b/test/browser-test.json @@ -858,5 +858,25 @@ "version" : "1.1", "major" : "1" } + }, + { + "desc" : "QQ on iOS", + "ua" : "Mozilla/5.0 (iPhone; CPU iPhone OS 10_0_2 like Mac OS X) AppleWebKit/602.1.50 (KHTML, like Gecko) Mobile/14A456 QQ/6.5.3.410 V1_IPH_SQ_6.5.3_1_APP_A Pixel/1080 Core/UIWebView NetType/WIFI Mem/26", + "expect" : + { + "name" : "QQ", + "version" : "6.5.3.410", + "major" : "6" + } + }, + { + "desc" : "QQ on Android", + "ua" : "Mozilla/5.0 (Linux; Android 6.0; PRO 6 Build/MRA58K) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/37.0.0.0 Mobile MQQBrowser/6.8 TBS/036824 Safari/537.36 V1_AND_SQ_6.5.8_422_YYB_D PA QQ/6.5.8.2910 NetType/WIFI WebP/0.3.0 Pixel/1080", + "expect" : + { + "name" : "QQ", + "version" : "6.5.8.2910", + "major" : "6" + } } ]