Backport - Added support for honor separated from Huawei (#749)

* Added support for honor separated from Huawei

* Revert "Added support for honor separated from Huawei"

This reverts commit 28bde1c.

* Added changes wrt comments

* Added another change

(cherry picked from commit be2f167)

Author: faisalman

src/ua-parser.js

@@ -280,7 +280,7 @@
             /miuibrowser\/([\w\.]+)/i                                           // MIUI Browser
             ], [VERSION, [NAME, 'MIUI' + SUFFIX_BROWSER]], [
             /fxios\/([\w\.-]+)/i                                                // Firefox for iOS
-            ], [VERSION, [NAME, PREFIX_MOBILE + FIREFOX]], [
+            ], [VERSION, [NAME, FIREFOX]], [
             /\bqihoobrowser\/?([\w\.]*)/i                                       // 360
             ], [VERSION, [NAME, '360']], [
             /\b(qq)\/([\w\.]+)/i                                                // QQ
@@ -429,10 +429,14 @@
             /\b(sh-?[altvz]?\d\d[a-ekm]?)/i
             ], [MODEL, [VENDOR, SHARP], [TYPE, MOBILE]], [
 
+            // Honor
+            /(?:honor)([-\w ]+)[;\)]/i
+            ], [MODEL, [VENDOR, 'Honor'], [TYPE, MOBILE]], [
+
             // Huawei
             /\b((?:ag[rs][23]?|bah2?|sht?|btv)-a?[lw]\d{2})\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, TABLET]], [
-            /(?:huawei|honor)([-\w ]+)[;\)]/i,
+            /(?:huawei)([-\w ]+)[;\)]/i,
             /\b(nexus 6p|\w{2,4}e?-[atu]?[ln][\dx][012359c][adn]?)\b(?!.+d\/s)/i
             ], [MODEL, [VENDOR, HUAWEI], [TYPE, MOBILE]], [
 

test/device-test.json

@@ -669,7 +669,7 @@
         "desc": "Huawei Honor 6A",
         "ua": "Mozilla/5.0 (Linux; Android 7.0; DLI-L22 Build/HONORDLI-L22; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/79.0.3945.116 Mobile Safari/537.36 [FB_IAB/FB4A;FBAV/252.0.0.22.355;]",
         "expect": {
-            "vendor": "Huawei",
+            "vendor": "Honor",
             "model": "DLI-L22",
             "type": "mobile"
         }
@@ -678,7 +678,7 @@
         "desc": "Huawei Honor 7",
         "ua": "Mozilla/5.0 (Linux; Android 6.0; PLK-L01 Build/HONORPLK-L01; wv) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Chrome/79.0.3945.116 Mobile Safari/537.36",
         "expect": {
-            "vendor": "Huawei",
+            "vendor": "Honor",
             "model": "PLK-L01",
             "type": "mobile"
         }
@@ -687,7 +687,7 @@
         "desc": "Huawei 10 Lite",
         "ua": "Mozilla/5.0 (Linux; Android 9; HRY-LX1 Build/HONORHRY-LX1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/68.0.3440.91 Mobile Safari/537.36",
         "expect": {
-            "vendor": "Huawei",
+            "vendor": "Honor",
             "model": "HRY-LX1",
             "type": "mobile"
         }