From 995e872ff8bcd91e1ed5cc106d47ad25a39cbd38 Mon Sep 17 00:00:00 2001
From: Raine Makelainen <raine.makelainen@jolla.com>
Date: Fri, 1 Mar 2019 14:48:14 +0200
Subject: [PATCH] Add Sailfish OS and Sailfish Browser detection

---
 src/ua-parser.js       |  8 +++++---
 test/browser-test.json | 10 ++++++++++
 test/os-test.json      |  9 +++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/ua-parser.js b/src/ua-parser.js
index d982c4e..208c67c 100755
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -334,6 +334,9 @@
             /android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)*/i        // Android Browser
             ], [VERSION, [NAME, 'Android Browser']], [
 
+            /(sailfishbrowser)\/([\w\.]+)/i                                     // Sailfish Browser
+            ], [[NAME, 'Sailfish Browser'], VERSION], [
+
             /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i
                                                                                 // Chrome/OmniWeb/Arora/Tizen/Nokia
             ], [NAME, VERSION], [
@@ -864,9 +867,8 @@
             ], [[NAME, 'BlackBerry'], VERSION], [
             /(blackberry)\w*\/?([\w\.]*)/i,                                     // Blackberry
             /(tizen)[\/\s]([\w\.]+)/i,                                          // Tizen
-            /(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|contiki)[\/\s-]?([\w\.]*)/i,
-                                                                                // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo/Contiki
-            /linux;.+(sailfish);/i                                              // Sailfish OS
+            /(android|webos|palm\sos|qnx|bada|rim\stablet\sos|meego|sailfish|contiki)[\/\s-]?([\w\.]*)/i
+                                                                                // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo/Contiki/Sailfish OS
             ], [NAME, VERSION], [
             /(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]*)/i                  // Symbian
             ], [[NAME, 'Symbian'], VERSION], [
diff --git a/test/browser-test.json b/test/browser-test.json
index b98db59..518241d 100644
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -59,6 +59,16 @@
             "major"   : "3"
         }
     },
+    {
+        "desc"    : "Sailfish Browser",
+        "ua"      : "Mozilla/5.0 (Linux; U; Sailfish 3.0; Mobile; rv:45.0) Gecko/45.0 Firefox/45.0 SailfishBrowser/1.0",
+        "expect"  :
+        {
+            "name"    : "Sailfish Browser",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
     {
         "desc"    : "Arora",
         "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 5.1; de-CH) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.2",
diff --git a/test/os-test.json b/test/os-test.json
index 5dc4c1d..a2a2411 100644
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -170,6 +170,15 @@
             "version" : "2.2.2"
         }
     },
+    {
+        "desc"    : "Sailfish",
+        "ua"      : "Mozilla/5.0 (Linux; U; Sailfish 3.0; Mobile; rv:45.0) Gecko/45.0 Firefox/45.0 SailfishBrowser/1.0",
+        "expect"  :
+        {
+            "name"    : "Sailfish",
+            "version" : "3.0"
+        }
+    },
     {
         "desc"    : "WebOS",
         "ua"      : "",