Merge branch 'release/1.8.0' into production

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Bowser Changelog
 
+### 1.8.0 (October 7, 2017)
+- [ADD] Add `osname` into result object (#200)
+
 ### 1.7.3 (August 30, 2017)
 - [FIX] Fix detection of Chrome on Android 8 OPR6 (#193)
 

README.md

@@ -1,7 +1,7 @@
 ## Bowser
 A Browser detector. Because sometimes, there is no other way, and not even good modern browsers always provide good feature detection mechanisms.
 
-[![bowser ci](https://secure.travis-ci.org/ded/bowser.png)](https://travis-ci.org/ded/bowser/)
+[![Build Status](https://travis-ci.org/lancedikson/bowser.svg?branch=master)](https://travis-ci.org/lancedikson/bowser)
 
 So... it works like this:
 
@@ -153,8 +153,9 @@ If detected, one of these flags may be set to true:
   * `tizen`
   * `sailfish`
 
-`osversion` may also be set:
+`osname` and `osversion` may also be set:
 
+  * `osname` - for the OS flags detected above: macOS, Windows, Windows Phone, Linux, Chrome OS, Android, iOS, Blackberry OS, Firefox OS, WebOS, Bada, Tizen, Sailfish OS, and Xbox
   * `osversion` - for Android, iOS, MacOS, Windows, Windows Phone, WebOS, Bada, and Tizen.  If included in UA string.
 
 iOS is always reported as `ios` and additionally as `iphone`/`ipad`/`ipod`, whichever one matches best.

bower.json

@@ -11,7 +11,7 @@
     "ender",
     "sniff"
   ],
-  "version": "1.7.3",
+  "version": "1.8.0",
   "homepage": "https://github.com/lancedikson/bowser",
   "scripts": [
     "src/bowser.js"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "bowser",
-  "version": "1.7.3",
+  "version": "1.8.0",
   "description": "Lightweight browser detector",
   "keywords": [
     "browser",

src/bowser.js

@@ -130,6 +130,7 @@
     else if (windowsphone) {
       result = {
         name: 'Windows Phone'
+      , osname: 'Windows Phone'
       , windowsphone: t
       }
       if (edgeVersion) {
@@ -150,6 +151,7 @@
     } else if (chromeos) {
       result = {
         name: 'Chrome'
+      , osname: 'Chrome OS'
       , chromeos: t
       , chromeBook: t
       , chrome: t
@@ -172,6 +174,7 @@
     else if (sailfish) {
       result = {
         name: 'Sailfish'
+      , osname: 'Sailfish OS'
       , sailfish: t
       , version: getFirstMatch(/sailfish\s?browser\/(\d+(\.\d+)?)/i)
       }
@@ -191,6 +194,7 @@
       }
       if (/\((mobile|tablet);[^\)]*rv:[\d\.]+\)/i.test(ua)) {
         result.firefoxos = t
+        result.osname = 'Firefox OS'
       }
     }
     else if (silk) {
@@ -217,6 +221,7 @@
     else if (/blackberry|\bbb\d+/i.test(ua) || /rim\stablet/i.test(ua)) {
       result = {
         name: 'BlackBerry'
+      , osname: 'BlackBerry OS'
       , blackberry: t
       , version: versionIdentifier || getFirstMatch(/blackberry[\d]+\/(\d+(\.\d+)?)/i)
       }
@@ -224,6 +229,7 @@
     else if (webos) {
       result = {
         name: 'WebOS'
+      , osname: 'WebOS'
       , webos: t
       , version: versionIdentifier || getFirstMatch(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i)
       };
@@ -232,6 +238,7 @@
     else if (/bada/i.test(ua)) {
       result = {
         name: 'Bada'
+      , osname: 'Bada'
       , bada: t
       , version: getFirstMatch(/dolfin\/(\d+(\.\d+)?)/i)
       };
@@ -239,6 +246,7 @@
     else if (tizen) {
       result = {
         name: 'Tizen'
+      , osname: 'Tizen'
       , tizen: t
       , version: getFirstMatch(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i) || versionIdentifier
       };
@@ -323,17 +331,23 @@
     // set OS flags for platforms that have multiple browsers
     if (!result.windowsphone && !result.msedge && (android || result.silk)) {
       result.android = t
+      result.osname = 'Android'
     } else if (!result.windowsphone && !result.msedge && iosdevice) {
       result[iosdevice] = t
       result.ios = t
+      result.osname = 'iOS'
     } else if (mac) {
       result.mac = t
+      result.osname = 'macOS'
     } else if (xbox) {
       result.xbox = t
+      result.osname = 'Xbox'
     } else if (windows) {
       result.windows = t
+      result.osname = 'Windows'
     } else if (linux) {
       result.linux = t
+      result.osname = 'Linux'
     }
 
     function getWindowsVersion (s) {

test/test.js

@@ -117,6 +117,11 @@ describe('Unsupported browser check', function() {
     assert.equal(unsupported, false);
   });
 
+  it('should NOT be passed by #isUnsupportedBrowser for IE10.6 and for IE10 miminal version specified in strict mode', function() {
+    var isUnsupported = browser.isUnsupportedBrowser({msie: "11"}, true, this.ie10_6);
+    assert.equal(isUnsupported, true);
+  });
+
   it('should NOT be passed by #check for IE10.6 and for IE11 miminal version specified', function() {
     var supported = browser.check({msie: "11"}, this.ie10_6);
     assert.equal(supported, false);