From 527ba70cf426e5e54f8e53308a1665432fec82c7 Mon Sep 17 00:00:00 2001
From: Faisalman <fyzlman@gmail.com>
Date: Wed, 7 Nov 2012 18:15:47 +0700
Subject: [PATCH] Add BB10 new UA pattern & Fix Mobile Safari being caught as
 just Safari

---
 package.json |  2 +-
 ua-parser.js | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/package.json b/package.json
index ca8168b..6de6f23 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "UA-Parser.JS",
   "name": "ua-parser-js",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
   "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
diff --git a/ua-parser.js b/ua-parser.js
index b098ba4..d643899 100644
--- a/ua-parser.js
+++ b/ua-parser.js
@@ -1,4 +1,4 @@
-// UA-Parser.JS v0.4.8
+// UA-Parser.JS v0.4.9
 // Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
@@ -154,10 +154,10 @@
             /(?:android.+(crmo|crios))\/((\d+)?[\w\.]+)/i,                      // Chrome for Android/iOS
             ], [['name', 'Chrome'], 'version', 'major'], [
             
-            /version\/((\d+)?[\w\.]+).+(mobile\s?safari|safari)/i               // Safari & Safari Mobile
+            /version\/((\d+)?[\w\.]+).+?(mobile\s?safari|safari)/i              // Safari & Safari Mobile
             ], ['version', 'major', 'name'], [
             
-            /applewebkit.+(mobile\s?safari|safari)((\/[\w\.]+))/i               // Safari < 3.0
+            /applewebkit.+?(mobile\s?safari|safari)((\/[\w\.]+))/i              // Safari < 3.0
             ], ['name', ['major', mapper.string, maps.browser.oldsafari.major], ['version', mapper.string, maps.browser.oldsafari.version]], [
             
             /(konqueror)\/((\d+)?[\w\.]+)/i,                                    // Konqueror
@@ -199,6 +199,8 @@
             /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
             /(asus)-?(\w+)/i                                                    // Asus
             ], ['vendor', 'model', ['type', 'Mobile']], [
+            /\((bb10);\s(\w+)/i                                                 // BlackBerry 10
+            ], [['vendor', 'BlackBerry'], 'model', ['type', 'Mobile']], [
 
             /android.+((transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+))/i       // Asus Tablets
             ], [['vendor', 'Asus'], 'model', ['type', 'Tablet']], [
@@ -264,6 +266,8 @@
             ], [['name', 'Windows'], ['version', mapper.string, maps.os.windows.version]], [
 
             // Mobile/Embedded OS
+            /\((bb)(10);/i                                                      // BlackBerry 10
+            ], [['name', 'BlackBerry'], 'version'], [
             /(blackberry).+version\/([\w\.]+)/i,                                // Blackberry
             /(tizen)\/([\w\.]+)/i,                                              // Tizen
             /(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i