From c53a2a1f72e3b632bcfaafb757f074d8c6056cac Mon Sep 17 00:00:00 2001
From: Faisal Salman <f@faisalman.com>
Date: Mon, 12 Apr 2021 12:55:37 +0700
Subject: [PATCH] Improve os detection: Windows Mobile without version

---
 src/ua-parser.js  |  4 ++--
 test/os-test.json | 13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index 94d34fe..8ce831f 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -690,8 +690,8 @@
             /microsoft (windows) (vista|xp)/i                                   // Windows (iTunes)
             ], [NAME, VERSION], [
             /(windows) nt 6\.2; (arm)/i,                                        // Windows RT
-            /(windows phone(?: os)*)[\s\/]?([\d\.\s\w]*)/i,                     // Windows Phone
-            /(windows mobile|windows)[\s\/]?([ntce\d\.\s]+[\w\.]+)(?!.+xbox)/i
+            /(windows (?:phone(?: os)?|mobile))[\s\/]?([\d\.\s\w]*)/i,          // Windows Phone
+            /(windows)[\s\/]?([ntce\d\.\s]+\w)(?!.+xbox)/i
             ], [NAME, [VERSION, strMapper, windowsVersionMap]], [
             /(win(?=3|9|n)|win 9x )([nt\d\.]+)/i
             ], [[NAME, 'Windows'], [VERSION, strMapper, windowsVersionMap]], [
diff --git a/test/os-test.json b/test/os-test.json
index be59b19..14590f3 100644
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -107,6 +107,15 @@
             "version" : "6.1"
         }
     },
+    {
+        "desc"    : "Windows Mobile",
+        "ua"      : "Opera/9.80 (Windows Mobile; WCE; Opera Mobi/WMD-50433; U; en) Presto/2.4.13 Version/10.00",
+        "expect"  :
+        {
+            "name"    : "Windows Mobile",
+            "version" : "undefined"
+        }
+    },
     {
         "desc"    : "Windows Phone",
         "ua"      : "Opera/9.80 (Windows Phone; Opera Mini/7.6.8/35.7518; U; ru) Presto/2.8.119 Version/11.10",
@@ -140,7 +149,7 @@
         "expect"  :
         {
             "name"    : "Windows",
-            "version" : "NT x.y"
+            "version" : "NT x"
         }
     },
     {
@@ -149,7 +158,7 @@
         "expect"  :
         {
             "name"    : "Windows",
-            "version" : "NT x.y"
+            "version" : "NT x"
         }
     },
     {