From 6d183003b34924039fc569fd54374e731e601212 Mon Sep 17 00:00:00 2001
From: Faisal Salman <fyzlman@gmail.com>
Date: Tue, 4 Dec 2012 15:25:11 +0700
Subject: [PATCH] Fix error build

---
 package.json |  2 +-
 readme.md    |  4 +++-
 ua-parser.js | 16 ++++++++++------
 3 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/package.json b/package.json
index 0f4af3b..9de3c02 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "title": "UA-Parser.JS",
   "name": "ua-parser-js",
-  "version": "0.4.14",
+  "version": "0.4.15",
   "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
   "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
diff --git a/readme.md b/readme.md
index 46dec61..467e77a 100644
--- a/readme.md
+++ b/readme.md
@@ -7,6 +7,8 @@ Lightweight JavaScript-based User-Agent string parser
 * Source    : https://github.com/faisalman/ua-parser-js
 * License   : GPLv2 & MIT
 
+[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.png)](https://travis-ci.org/faisalman/ua-parser-js)
+
 ## Features
 
 Extract detailed type of web browser, layout engine, operating system, and device purely from user-agent string.
@@ -74,7 +76,7 @@ Extract detailed type of web browser, layout engine, operating system, and devic
 ## Using node.js
 
 ```sh
-npm install ua-parser-js
+$ npm install ua-parser-js
 ```
 
 ```js
diff --git a/ua-parser.js b/ua-parser.js
index 9a29c2b..78bdf87 100644
--- a/ua-parser.js
+++ b/ua-parser.js
@@ -1,4 +1,4 @@
-// UA-Parser.JS v0.4.14
+// UA-Parser.JS v0.4.15
 // Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
@@ -125,13 +125,13 @@
 
             // Presto based
             /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
-            /(opera\smobi)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mobile
+            /(opera\smobi).+version\/((\d+)?[\w\.-]+)/i,                        // Opera Mobile
             /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera > 9.80
             /(opera)[\/\s]+((\d+)?[\w\.]+)/i,                                   // Opera < 9.80
 
             // Mixed
             /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
-            /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)/i,
+            /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)*/i,
                                                                                 // Lunascape/Maxthon/Netfront/Jasmine/Blazer
 
             // Trident based
@@ -162,13 +162,17 @@
             ], ['name', ['major', mapper.string, maps.browser.oldsafari.major], ['version', mapper.string, maps.browser.oldsafari.version]], [
             
             /(konqueror)\/((\d+)?[\w\.]+)/i,                                    // Konqueror
-            /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i,
+            /(applewebkit|khtml)\/((\d+)?[\w\.]+)/i
+            ], ['name', 'version', 'major'], [
 
             // Gecko based
+            /(navigator|netscape)\/((\d+)?[\w\.-]+)/i                           // Netscape
+            ], [['name', 'Netscape'], 'version', 'major'], [
+            /(swiftfox)/i,                                                      // Swiftfox
             /(iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,
                                                                                 // Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo
-            /(firefox|seamonkey|netscape|navigator|k-meleon|icecat|iceape|firebird|phoenix)\/((\d+)?[\w\.]+)/i,
-                                                                                // Firefox/SeaMonkey/Netscape/K-Meleon/IceCat/IceApe/Firebird/Phoenix
+            /(firefox|seamonkey|k-meleon|icecat|iceape|firebird|phoenix)\/((\d+)?[\w\.-]+)/i,
+                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
             /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i,                          // Mozilla
 
             // Other