From 0a2b05c6fd333a152285cfce4df7d86c7c10babf Mon Sep 17 00:00:00 2001 From: Faisal Salman Date: Sat, 8 Nov 2014 09:55:26 +0700 Subject: [PATCH] Fix #77: Standardize OS name for Mac OS --- src/ua-parser.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ua-parser.js b/src/ua-parser.js index 8fcc4ba..8491687 100644 --- a/src/ua-parser.js +++ b/src/ua-parser.js @@ -631,14 +631,15 @@ /(ip[honead]+)(?:.*os\s*([\w]+)*\slike\smac|;\sopera)/i // iOS ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [ + /(macintosh|mac(?=_powerpc)/i, /(mac\sos\sx)\s?([\w\s\.]+\w)*/i // Mac OS - ], [NAME, [VERSION, /_/g, '.']], [ + ], [[NAME, 'Mac OS'], [VERSION, /_/g, '.']], [ // Other /((?:open)?solaris)[\/\s-]?([\w\.]+)*/i, // Solaris /(haiku)\s(\w+)/i, // Haiku /(aix)\s((\d)(?=\.|\)|\s)[\w\.]*)*/i, // AIX - /(macintosh|mac(?=_powerpc)|plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms)/i, + /plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos|openvms)/i, // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS/RISCOS/OpenVMS /(unix)\s?([\w\.]+)*/i // UNIX ], [NAME, VERSION]