Merge pull request #2 from dmxfee/master

Updated factory to latest bowser code which supports edge detection.

Author: jacqueslareau

src/angular-bowser.js

@@ -11,9 +11,16 @@ angular.module('jlareau.bowser', [])
         return (match && match.length > 1 && match[1]) || '';
       }
 
+      function getSecondMatch(regex) {
+        var match = ua.match(regex);
+        return (match && match.length > 1 && match[2]) || '';
+      }
+
       var iosdevice = getFirstMatch(/(ipod|iphone|ipad)/i).toLowerCase()
         , likeAndroid = /like android/i.test(ua)
         , android = !likeAndroid && /android/i.test(ua)
+        , chromeBook = /CrOS/.test(ua)
+        , edgeVersion = getFirstMatch(/edge\/(\d+(\.\d+)?)/i)
         , versionIdentifier = getFirstMatch(/version\/(\d+(\.\d+)?)/i)
         , tablet = /tablet/i.test(ua)
         , mobile = !tablet && /[^-]mobi/i.test(ua)
@@ -26,12 +33,25 @@ angular.module('jlareau.bowser', [])
         , version: versionIdentifier || getFirstMatch(/(?:opera|opr)[\s\/](\d+(\.\d+)?)/i)
         }
       }
+      else if (/yabrowser/i.test(ua)) {
+        result = {
+          name: 'Yandex Browser'
+        , yandexbrowser: t
+        , version: versionIdentifier || getFirstMatch(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i)
+        }
+      }
       else if (/windows phone/i.test(ua)) {
         result = {
           name: 'Windows Phone'
         , windowsphone: t
-        , msie: t
-        , version: getFirstMatch(/iemobile\/(\d+(\.\d+)?)/i)
+        }
+        if (edgeVersion) {
+          result.msedge = t
+          result.version = edgeVersion
+        }
+        else {
+          result.msie = t
+          result.version = getFirstMatch(/iemobile\/(\d+(\.\d+)?)/i)
         }
       }
       else if (/msie|trident/i.test(ua)) {
@@ -40,6 +60,19 @@ angular.module('jlareau.bowser', [])
         , msie: t
         , version: getFirstMatch(/(?:msie |rv:)(\d+(\.\d+)?)/i)
         }
+      } else if (chromeBook) {
+        result = {
+          name: 'Chrome'
+        , chromeBook: t
+        , chrome: t
+        , version: getFirstMatch(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)
+        }
+      } else if (/chrome.+? edge/i.test(ua)) {
+        result = {
+          name: 'Microsoft Edge'
+        , msedge: t
+        , version: edgeVersion
+        }
       }
       else if (/chrome|crios|crmo/i.test(ua)) {
         result = {
@@ -82,7 +115,7 @@ angular.module('jlareau.bowser', [])
         }
       }
       else if (/silk/i.test(ua)) {
-        result = {
+        result =  {
           name: 'Amazon Silk'
         , silk: t
         , version : getFirstMatch(/silk\/(\d+(\.\d+)?)/i)
@@ -137,10 +170,15 @@ angular.module('jlareau.bowser', [])
         , version: versionIdentifier
         }
       }
-      else result = {}
+      else {
+        result = {
+          name: getFirstMatch(/^(.*)\/(.*) /),
+          version: getSecondMatch(/^(.*)\/(.*) /)
+        };
+      }
 
       // set webkit or gecko flag for browsers based on these engines
-      if (/(apple)?webkit/i.test(ua)) {
+      if (!result.msedge && /(apple)?webkit/i.test(ua)) {
         result.name = result.name || "Webkit"
         result.webkit = t
         if (!result.version && versionIdentifier) {
@@ -153,7 +191,7 @@ angular.module('jlareau.bowser', [])
       }
 
       // set OS flags for platforms that have multiple browsers
-      if (android || result.silk) {
+      if (!result.msedge && (android || result.silk)) {
         result.android = t
       } else if (iosdevice) {
         result[iosdevice] = t
@@ -162,13 +200,13 @@ angular.module('jlareau.bowser', [])
 
       // OS version extraction
       var osVersion = '';
-      if (iosdevice) {
+      if (result.windowsphone) {
+        osVersion = getFirstMatch(/windows phone (?:os)?\s?(\d+(\.\d+)*)/i);
+      } else if (iosdevice) {
         osVersion = getFirstMatch(/os (\d+([_\s]\d+)*) like mac os x/i);
         osVersion = osVersion.replace(/[_\s]/g, '.');
       } else if (android) {
         osVersion = getFirstMatch(/android[ \/-](\d+(\.\d+)*)/i);
-      } else if (result.windowsphone) {
-        osVersion = getFirstMatch(/windows phone (?:os)?\s?(\d+(\.\d+)*)/i);
       } else if (result.webos) {
         osVersion = getFirstMatch(/(?:web|hpw)os\/(\d+(\.\d+)*)/i);
       } else if (result.blackberry) {
@@ -192,12 +230,15 @@ angular.module('jlareau.bowser', [])
 
       // Graded Browser Support
       // http://developer.yahoo.com/yui/articles/gbs
-      if ((result.msie && result.version >= 10) ||
+      if (result.msedge ||
+          (result.msie && result.version >= 10) ||
+          (result.yandexbrowser && result.version >= 15) ||
           (result.chrome && result.version >= 20) ||
           (result.firefox && result.version >= 20.0) ||
           (result.safari && result.version >= 6) ||
           (result.opera && result.version >= 10.0) ||
-          (result.ios && result.osversion && result.osversion.split(".")[0] >= 6)
+          (result.ios && result.osversion && result.osversion.split(".")[0] >= 6) ||
+          (result.blackberry && result.version >= 10.1)
           ) {
         result.a = t;
       }
@@ -216,6 +257,18 @@ angular.module('jlareau.bowser', [])
 
     var bowser = detect(typeof navigator !== 'undefined' ? navigator.userAgent : '')
 
+    bowser.test = function (browserList) {
+      for (var i = 0; i < browserList.length; ++i) {
+        var browserItem = browserList[i];
+        if (typeof browserItem=== 'string') {
+          if (browserItem in bowser) {
+            return true;
+          }
+        }
+      }
+      return false;
+    }
+
 
     /*
     * Set our detect method to the main bowser object so we can