Merge pull request #105 from wbinnssmith/wbinnssmith/os-detection

Expose the UA's os as a property on the results
bowser-js · Nov 2, 2015 · 611795a · 611795a
2 parents 5f93339 + 32e2bc4
commit 611795a
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 9 deletions.
diff --git a/README.md b/README.md
@@ -35,10 +35,14 @@ if (bowser.msie && bowser.version <= 6) {
 
 For all detected browsers the browser version is set in the `version` field.
 
-## Flags set for detected mobile Operating Systems
+## Flags set for detected Operating Systems
 
+  * `mac`
+  *  Windows other than Windows Phone as `windows`
+  *  Windows Phone as `windowsphone`
+  * `linux` for Linux other than `android`, `chromeos`, `webos`, `tizen`, and `sailfish`
+  * `chromeos`
   * `android`
-  * Windows Phone as `windowsphone`
   * `ios` (`iphone`/`ipad`/`ipod`)
   * `blackberry`
   * `firefoxos`

diff --git a/src/bowser.js b/src/bowser.js
@@ -24,7 +24,15 @@
     var iosdevice = getFirstMatch(/(ipod|iphone|ipad)/i).toLowerCase()
       , likeAndroid = /like android/i.test(ua)
       , android = !likeAndroid && /android/i.test(ua)
-      , chromeBook = /CrOS/.test(ua)
+      , chromeos = /CrOS/.test(ua)
+      , silk = /silk/i.test(ua)
+      , sailfish = /sailfish/i.test(ua)
+      , tizen = /tizen/i.test(ua)
+      , webos = /(web|hpw)os/i.test(ua)
+      , windowsphone = /windows phone/i.test(ua)
+      , windows = !windowsphone && /windows/i.test(ua)
+      , mac = !iosdevice && !silk && /macintosh/i.test(ua)
+      , linux = !android && !sailfish && !tizen && !webos && /linux/i.test(ua)
       , edgeVersion = getFirstMatch(/edge\/(\d+(\.\d+)?)/i)
       , versionIdentifier = getFirstMatch(/version\/(\d+(\.\d+)?)/i)
       , tablet = /tablet/i.test(ua)
@@ -45,7 +53,7 @@
       , version: versionIdentifier || getFirstMatch(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i)
       }
     }
-    else if (/windows phone/i.test(ua)) {
+    else if (windowsphone) {
       result = {
         name: 'Windows Phone'
       , windowsphone: t
@@ -65,9 +73,10 @@
       , msie: t
       , version: getFirstMatch(/(?:msie |rv:)(\d+(\.\d+)?)/i)
       }
-    } else if (chromeBook) {
+    } else if (chromeos) {
       result = {
         name: 'Chrome'
+      , chromeos: t
       , chromeBook: t
       , chrome: t
       , version: getFirstMatch(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)
@@ -95,7 +104,7 @@
         result.version = versionIdentifier
       }
     }
-    else if (/sailfish/i.test(ua)) {
+    else if (sailfish) {
       result = {
         name: 'Sailfish'
       , sailfish: t
@@ -119,7 +128,7 @@
         result.firefoxos = t
       }
     }
-    else if (/silk/i.test(ua)) {
+    else if (silk) {
       result =  {
         name: 'Amazon Silk'
       , silk: t
@@ -146,7 +155,7 @@
       , version: versionIdentifier || getFirstMatch(/blackberry[\d]+\/(\d+(\.\d+)?)/i)
       }
     }
-    else if (/(web|hpw)os/i.test(ua)) {
+    else if (webos) {
       result = {
         name: 'WebOS'
       , webos: t
@@ -161,7 +170,7 @@
       , version: getFirstMatch(/dolfin\/(\d+(\.\d+)?)/i)
       };
     }
-    else if (/tizen/i.test(ua)) {
+    else if (tizen) {
       result = {
         name: 'Tizen'
       , tizen: t
@@ -201,6 +210,12 @@
     } else if (iosdevice) {
       result[iosdevice] = t
       result.ios = t
+    } else if (windows) {
+      result.windows = t
+    } else if (mac) {
+      result.mac = t
+    } else if (linux) {
+      result.linux = t
     }
 
     // OS version extraction