Add new Webkit Opera

Add requirejs module support

package.json

@@ -1,11 +1,11 @@
 {
   "title": "UA-Parser.JS",
   "name": "ua-parser-js",
-  "version": "0.4.15",
+  "version": "0.5.15",
   "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
   "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
-    "user agent",
+    "user-agent",
     "parser",
     "browser",
     "engine",
@@ -14,7 +14,11 @@
   ],
   "homepage": "http://github.com/faisalman/ua-parser-js",
   "contributors": [
-    "Faisal Salman <fyzlman@gmail.com>"
+    "Faisal Salman <fyzlman@gmail.com>",
+    "Christopher De Cairos <chris.decairos@gmail.com>",
+    "John Tantalo <john.tantalo@gmail.com>",
+    "Jon Buckley <jon@jbuckley.ca>",
+    "Lee Treveil <leetreveil@gmail.com>"
   ],
   "main": "ua-parser",
   "scripts": {

readme.md

@@ -2,16 +2,18 @@
 
 Lightweight JavaScript-based User-Agent string parser
 
+[![Build Status](https://travis-ci.org/faisalman/ua-parser-js.png)](https://travis-ci.org/faisalman/ua-parser-js)
+
 * Author    : Faisalman <<fyzlman@gmail.com>>
 * Home      : http://faisalman.github.com/ua-parser-js
 * 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.
+Extract detailed type of web browser, layout engine, operating system, and device purely from user-agent string with relatively lightweight footprint (~7KB minified / ~3KB gzipped).
+
+![It's over 9000](https://pbs.twimg.com/media/A9LpEG6CIAA5VrT.jpg)
 
 ## Methods
 
@@ -63,7 +65,7 @@ Extract detailed type of web browser, layout engine, operating system, and devic
     
     console.log(parser.getResult().browser);    // {name: "Chromium", major: "15", version: "15.0.874.106"}
     console.log(parser.getResult().device);     // {model: undefined, type: undefined, vendor: undefined}
-    console.log(parser.getResult().engine);     // {name: "AppleWebKit", version: "535.2"}
+    console.log(parser.getResult().engine);     // {name: "WebKit", version: "535.2"}
     console.log(parser.getResult().os);         // {name: "Ubuntu", version: "11.10"}
     
     // let's take another test please
@@ -73,6 +75,17 @@ Extract detailed type of web browser, layout engine, operating system, and devic
 </script>
 ```
 
+## Using requirejs
+
+If you're using requirejs, you can load UA-Parser like any other module.
+
+```js
+require(['ua-parser'], function(UAParser) {
+    var parser = new UAParser();
+    console.log(parser.getResult());
+});
+```
+
 ## Using node.js
 
 ```sh
@@ -86,12 +99,35 @@ var uaString    = 'Mozilla/5.0 (PlayBook; U; RIM Tablet OS 1.0.0; en-US) AppleWe
 
 console.log(parser.setUA(uaString).getDevice().model);  // "PlayBook"
 console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
-console.log(parser.getEngine().name);                   // "AppleWebKit"
+console.log(parser.getEngine().name);                   // "WebKit"
+```
+
+## Using jQuery
+
+If you're using jQuery, `$.ua` object will be created automatically based on container's user-agent. Use `$.ua.get()` / `$.ua.set(uastring)` to get/set user-agent. In case you need, `UAParser` constructor is still present in global though.
+
+```js
+// In browser with default user-agent: 'Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0':
+
+// Do some tests
+console.log($.ua.device);           // {vendor: "HTC", model: "Evo Shift 4G", type: "mobile"}
+console.log($.ua.os);               // {name: "Android", version: "2.3.4"}
+console.log($.ua.os.name);          // "Android"
+console.log($.ua.get());            // "Mozilla/5.0 (Linux; U; Android 2.3.4; en-us; Sprint APA7373KT Build/GRJ22) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0"
+
+// reset to custom user-agent
+$.ua.set('Mozilla/5.0 (Linux; U; Android 3.0.1; en-us; Xoom Build/HWI69) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13');
+
+// Test again
+console.log($.ua.device);           // {vendor: "Motorola", model: "Xoom", type: "tablet"}
+console.log($.ua.engine.name);      // "Webkit"
+console.log($.ua.browser.version);  // "4.0"
+console.log(parseInt($.ua.browser.version.split('.')[0], 10));  // 4
 ```
 
 ## License
 
-Copyright © 2012 Faisalman <<fyzlman@gmail.com>>
+Copyright © 2012-2013 Faisalman <<fyzlman@gmail.com>>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

ua-parser-js.jquery.json

@@ -0,0 +1,31 @@
+{
+    "title": "UA-Parser.JS",
+    "name": "ua-parser-js",
+    "version": "0.5.15",
+    "description": "Lightweight JavaScript-based user-agent string parser",
+    "keywords": [
+        "user-agent",
+        "parser",
+        "browser",
+        "engine",
+        "os",
+        "device"
+    ],
+    "homepage": "https://faisalman.github.com/ua-parser-js",
+    "author": {
+        "name": "Faisal Salman",
+        "email": "fyzlman@gmail.com"
+    },
+    "dependencies": {
+        "jquery": ">=1.5"
+    },
+    "licenses": [
+        {
+            "type": "MIT",
+            "url": "http://www.opensource.org/licenses/mit-license.php"
+        }
+    ],
+    "bugs": "https://github.com/faisalman/ua-parser-js/issues",
+    "docs": "https://github.com/faisalman/ua-parser-js",
+    "download": "https://raw.github.com/faisalman/ua-parser-js/master/ua-parser.min.js"
+}

ua-parser.js

@@ -1,14 +1,28 @@
-// UA-Parser.JS v0.4.15
+// UA-Parser.JS v0.5.15
 // Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
-// Copyright © 2012 Faisalman
+// Copyright © 2012-2013 Faisalman
 // Dual licensed under GPLv2 & MIT
 
 (function (global, undefined) {
 
     'use strict';
 
+    var EMPTY       = '',
+        FUNC        = 'function',
+        UNDEF       = 'undefined',
+        OBJ         = 'object',
+        MAJOR       = 'major',
+        MODEL       = 'model',
+        NAME        = 'name',
+        TYPE        = 'type',
+        VENDOR      = 'vendor',
+        VERSION     = 'version',
+        CONSOLE     = 'console',
+        MOBILE      = 'mobile',
+        TABLET      = 'tablet';
+
     var mapper = {
 
         regex : function () {
@@ -22,16 +36,16 @@
                     props = args[i + 1];   // even sequence (1,3,5,..)
 
                 // construct object barebones
-                if (typeof result === 'undefined') {
+                if (typeof result === UNDEF) {
                     result = {};
                     for (k = 0; k < props.length; k++) {
-                        if (typeof props[k] === 'object') {
+                        if (typeof props[k] === OBJ) {
                             result[props[k][0]] = undefined;
                         } else {
                             result[props[k]] = undefined;
                         }
                     }
-                    if (this.getUA().toString() === '') {
+                    if (this.getUA().toString() === EMPTY) {
                         return result;
                     }
                 }
@@ -42,10 +56,10 @@
                     if (!!l) {
                         for (k = 0; k < props.length; k++) {
                             m = l[k + 1];
-                            if (typeof props[k] === 'object' && props[k].length === 2) {
+                            if (typeof props[k] === OBJ && props[k].length === 2) {
                                 result[props[k][0]] = props[k][1];
-                            } else if (typeof props[k] === 'object' && props[k].length === 3) {
+                            } else if (typeof props[k] === OBJ && props[k].length === 3) {
-                                if (typeof props[k][1] === 'function' && !(props[k][1].exec && props[k][1].test)) {
+                                if (typeof props[k][1] === FUNC && !(props[k][1].exec && props[k][1].test)) {
                                     result[props[k][0]] = m ? props[k][1].call(this, m, props[k][2]) : undefined;
                                 } else {
                                     result[props[k][0]] = m ? m.replace(props[k][1], props[k][2]) : undefined;
@@ -67,14 +81,14 @@
 
             for (var i in map) {
                 if (map.hasOwnProperty(i)) {
-                    if (typeof map[i] === 'object' && map[i].length > 0) {
+                    if (typeof map[i] === OBJ && map[i].length > 0) {
                         for (var j = 0; j < map[i].length; j++) {
                             if (str.toLowerCase().indexOf(map[i][j].toLowerCase()) !== -1) {
-                                return (i.toString() === 'undefined') ? undefined : i;
+                                return (i.toString() === UNDEF) ? undefined : i;
                             }
                         }
                     } else if (str.toLowerCase().indexOf(map[i].toLowerCase()) !== -1) {
-                        return (i.toString() === 'undefined') ? undefined : i;
+                        return (i.toString() === UNDEF) ? undefined : i;
                     }
                 }
             }
@@ -83,6 +97,7 @@
     };
 
     var maps = {
+
         browser : {
             oldsafari : {
                 major : {
@@ -102,6 +117,19 @@
                 }
             }
         },
+
+        device : {
+            sprint : {
+                model : {
+                    'Evo Shift 4G' : '7373KT'
+                },
+                vendor : {
+                    'HTC'       : 'APA',
+                    'Sprint'    : 'Sprint'
+                }
+            }
+        },
+
         os : {
             windows : {
                 version : {
@@ -125,10 +153,15 @@
 
             // Presto based
             /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
-            /(opera\smobi).+version\/((\d+)?[\w\.-]+)/i,                        // Opera Mobile
+            /(opera\s[mobiletab]+).+version\/((\d+)?[\w\.-]+)/i,                // Opera Mobi/Tablet
             /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera > 9.80
             /(opera)[\/\s]+((\d+)?[\w\.]+)/i,                                   // Opera < 9.80
             
+            ], [NAME, VERSION, MAJOR], [
+
+            /\s(opr)\/((\d+)?[\w\.]+)/i                                         // Opera Webkit
+            ], [[NAME, 'Opera'], VERSION, MAJOR], [
+
             // Mixed
             /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
             /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)*/i,
@@ -140,153 +173,169 @@
             /ms(ie)\s((\d+)?[\w\.]+)/i,                                         // Internet Explorer
 
             // Webkit/KHTML based
+            /(rekonq)((?:\/)[\w\.]+)*/i,                                        // Rekonq
             /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt)\/((\d+)?[\w\.-]+)/i
                                                                                 // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt
-            ], ['name', 'version', 'major'], [
+            ], [NAME, VERSION, MAJOR], [
 
             /(yabrowser)\/((\d+)?[\w\.]+)/i                                     // Yandex
-            ], [['name', 'Yandex'], 'version', 'major'], [
+            ], [[NAME, 'Yandex'], VERSION, MAJOR], [
+
+            /(comodo_dragon)\/((\d+)?[\w\.]+)/i                                 // Comodo Dragon
+            ], [[NAME, /_/g, ' '], VERSION, MAJOR], [
 
             /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?((\d+)?[\w\.]+)/i
                                                                                 // Chrome/OmniWeb/Arora/Tizen/Nokia
-            ], ['name', 'version', 'major'], [
+            ], [NAME, VERSION, MAJOR], [
 
             /(dolfin)\/((\d+)?[\w\.]+)/i                                        // Dolphin
-            ], [['name', 'Dolphin'], 'version', 'major'], [
+            ], [[NAME, 'Dolphin'], VERSION, MAJOR], [
 
             /((?:android.+)crmo|crios)\/((\d+)?[\w\.]+)/i                       // Chrome for Android/iOS
-            ], [['name', 'Chrome'], 'version', 'major'], [
+            ], [[NAME, 'Chrome'], VERSION, MAJOR], [
 
             /version\/((\d+)?[\w\.]+).+?mobile\/\w+\s(safari)/i                 // Mobile Safari
-            ], ['version', 'major', ['name', 'Mobile Safari']], [
+            ], [VERSION, MAJOR, [NAME, 'Mobile Safari']], [
 
             /version\/((\d+)?[\w\.]+).+?(mobile\s?safari|safari)/i              // Safari & Safari Mobile
-            ], ['version', 'major', 'name'], [
+            ], [VERSION, MAJOR, NAME], [
 
             /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]], [
+            ], [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
-            ], ['name', 'version', 'major'], [
+            ], [NAME, VERSION, MAJOR], [
 
             // Gecko based
             /(navigator|netscape)\/((\d+)?[\w\.-]+)/i                           // Netscape
-            ], [['name', 'Netscape'], 'version', 'major'], [
+            ], [[NAME, 'Netscape'], VERSION, MAJOR], [
             /(swiftfox)/i,                                                      // Swiftfox
-            /(iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo)[\/\s]?((\d+)?[\w\.\+]+)/i,
+            /(iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?((\d+)?[\w\.\+]+)/i,
-                                                                                // Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo
+                                                                                // Iceweasel/Camino/Chimera/Fennec/Maemo/Minimo/Conkeror
             /(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
+            /(mozilla)\/((\d+)?[\w\.]+).+rv\:.+gecko\/\d+/i,                    // Mozilla
 
             // Other
-            /(uc\s?browser|polaris|lynx|dillo|icab|doris)[\/\s]?((\d+)?[\w\.]+)/i,
+            /(uc\s?browser|polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf)[\/\s]?((\d+)?[\w\.]+)/i,
-                                                                                // UCBrowser/Polaris/Lynx/Dillo/iCab/Doris
+                                                                                // UCBrowser/Polaris/Lynx/Dillo/iCab/Doris/Amaya/w3m/NetSurf
+            /(links)\s\(((\d+)?[\w\.]+)/i,                                      // Links
             /(gobrowser)\/?((\d+)?[\w\.]+)*/i,                                  // GoBrowser
+            /(ice\s?browser)\/v?((\d+)?[\w\._]+)/i,                             // ICE Browser
             /(mosaic)[\/\s]((\d+)?[\w\.]+)/i                                    // Mosaic
-            ], ['name', 'version', 'major']
+            ], [NAME, VERSION, MAJOR]
         ],
 
         device : [[
 
             /\((ipad|playbook);[\w\s\);-]+(rim|apple)/i                         // iPad/PlayBook
-            ], ['model', 'vendor', ['type', 'Tablet']], [
+            ], [MODEL, VENDOR, [TYPE, TABLET]], [
 
             /(hp).+(touchpad)/i,                                                // HP TouchPad
             /(kindle)\/([\w\.]+)/i,                                             // Kindle
             /\s(nook)[\w\s]+build\/(\w+)/i,                                     // Nook
             /(dell)\s(strea[kpr\s\d]*[\dko])/i                                  // Dell Streak
-            ], ['vendor', 'model', ['type', 'Tablet']], [
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
 
             /\((ip[honed]+);.+(apple)/i                                         // iPod/iPhone
-            ], ['model', 'vendor', ['type', 'Mobile']], [
+            ], [MODEL, VENDOR, [TYPE, MOBILE]], [
 
             /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
             /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|huawei|meizu|motorola)[\s_-]?([\w-]+)*/i,
                                                                                 // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Huawei/Meizu/Motorola
             /(hp)\s([\w\s]+\w)/i,                                               // HP iPAQ
             /(asus)-?(\w+)/i                                                    // Asus
-            ], ['vendor', 'model', ['type', 'Mobile']], [
+            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
             /\((bb10);\s(\w+)/i                                                 // BlackBerry 10
-            ], [['vendor', 'BlackBerry'], 'model', ['type', 'Mobile']], [
+            ], [[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']], [
+            ], [[VENDOR, 'Asus'], MODEL, [TYPE, TABLET]], [
 
             /(sony)\s(tablet\s[ps])/i                                           // Sony Tablets
-            ], ['vendor', 'model', ['type', 'Tablet']], [
+            ], [VENDOR, MODEL, [TYPE, TABLET]], [
 
             /(nintendo|playstation)\s([wids3portablev]+)/i                      // Nintendo/Playstation
-            ], ['vendor', 'model', ['type', 'Console']], [
+            ], [VENDOR, MODEL, [TYPE, CONSOLE]], [
+
+            /(sprint\s(\w+))/i                                                  // Sprint Phones
+            ], [[VENDOR, mapper.string, maps.device.sprint.vendor], [MODEL, mapper.string, maps.device.sprint.model], [TYPE, MOBILE]], [
 
             /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i,                               // HTC
-            /(zte)-(\w+)*/i                                                     // ZTE
+            /(zte)-(\w+)*/i,                                                    // ZTE
-            ], ['vendor', ['model', /_/g, ' '], ['type', 'Mobile']], [
+            /(alcatel|geeksphone|huawei|lenovo|nexian|panasonic|;\ssony)[_\s-]?([\w-]+)*/i
+                                                                                // Alcatel/GeeksPhone/Huawei/Lenovo/Nexian/Panasonic/Sony
+            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
 
             /\s((milestone|droid[2x]?))[globa\s]*\sbuild\//i,                   // Motorola
             /(mot)[\s-]?(\w+)*/i
-            ], [['vendor', 'Motorola'], 'model', ['type', 'Mobile']], [
+            ], [[VENDOR, 'Motorola'], MODEL, [TYPE, MOBILE]], [
             /android.+\s((mz60\d|xoom[\s2]{0,2}))\sbuild\//i
-            ], [['vendor', 'Motorola'], 'model', ['type', 'Tablet']], [
+            ], [[VENDOR, 'Motorola'], MODEL, [TYPE, TABLET]], [
 
             /android.+((sch-i[89]0\d|shw-m380s|gt-p\d{4}|gt-n8000|sgh-t8[56]9))/i
-            ], [['vendor', 'Samsung'], 'model', ['type', 'Tablet']], [          // Samsung
+            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, TABLET]], [                  // Samsung
             /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,
             /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
             /sec-((sgh\w+))/i
-            ], [['vendor', 'Samsung'], 'model', ['type', 'Mobile']], [
+            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, MOBILE]], [
             /(sie)-(\w+)*/i                                                     // Siemens
-            ], [['vendor', 'Siemens'], 'model', ['type', 'Mobile']], [
+            ], [[VENDOR, 'Siemens'], MODEL, [TYPE, MOBILE]], [
 
             /(maemo|nokia).*(n900|lumia\s\d+)/i,                                // Nokia
             /(nokia)[\s_-]?([\w-]+)*/i
-            ], [['vendor', 'Nokia'], 'model', ['type', 'Mobile']], [
+            ], [[VENDOR, 'Nokia'], MODEL, [TYPE, MOBILE]], [
 
             /android\s3\.[\s\w-;]{10}((a\d{3}))/i                               // Acer
-            ], [['vendor', 'Acer'], 'model', ['type', 'Tablet']], [
+            ], [[VENDOR, 'Acer'], MODEL, [TYPE, TABLET]], [
 
             /android\s3\.[\s\w-;]{10}(lg?)-([06cv9]{3,4})/i                     // LG
-            ], [['vendor', 'LG'], 'model', ['type', 'Tablet']], [
+            ], [[VENDOR, 'LG'], MODEL, [TYPE, TABLET]], [
             /(lg)[e;\s-\/]+(\w+)*/i
-            ], [['vendor', 'LG'], 'model', ['type', 'Mobile']], [
+            ], [[VENDOR, 'LG'], MODEL, [TYPE, MOBILE]], [
 
             /(mobile|tablet);.+rv\:.+gecko\//i                                  // Unidentifiable
-            ], ['type', 'vendor', 'model']
+            ], [TYPE, VENDOR, MODEL]
         ],
 
         engine : [[
 
             /(presto)\/([\w\.]+)/i,                                             // Presto
-            /([aple]*webkit|trident|netfront)\/([\w\.]+)/i,                     // Webkit/Trident/NetFront
+            /(webkit|trident|netfront|netsurf|amaya|lynx|w3m)\/([\w\.]+)/i,     // WebKit/Trident/NetFront/NetSurf/Amaya/Lynx/w3m
             /(khtml)\/([\w\.]+)/i,                                              // KHTML
-            /(tasman)\s([\w\.]+)/i                                              // Tasman
+            /(tasman)\s([\w\.]+)/i,                                             // Tasman
-            ], ['name', 'version'], [
+            /(links)\s\(([\w\.]+)/i,                                            // Links
+            /(icab)[\/\s]([2-3]\.[\d\.]+)/i                                     // iCab
+            ], [NAME, VERSION], [
 
             /rv\:([\w\.]+).*(gecko)/i                                           // Gecko
-            ], ['version', 'name']
+            ], [VERSION, NAME]
         ],
 
         os : [[
 
             // Windows based
             /(windows)\snt\s6\.2;\s(arm)/i,                                     // Windows RT
-            /(windows\sphone\sos|windows\s?[mobile]*)[\s\/]?([ntce\d\.\s]+\w)/i
+            /(windows\sphone(?:\sos)*|windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i
-            ], ['name', ['version', mapper.string, maps.os.windows.version]], [
+            ], [NAME, [VERSION, mapper.string, maps.os.windows.version]], [
             /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
-            ], [['name', 'Windows'], ['version', mapper.string, maps.os.windows.version]], [
+            ], [[NAME, 'Windows'], [VERSION, mapper.string, maps.os.windows.version]], [
 
             // Mobile/Embedded OS
             /\((bb)(10);/i                                                      // BlackBerry 10
-            ], [['name', 'BlackBerry'], 'version'], [
+            ], [[NAME, 'BlackBerry'], VERSION], [
-            /(blackberry).+version\/([\w\.]+)/i,                                // Blackberry
+            /(blackberry)\w*\/?([\w\.]+)*/i,                                    // Blackberry
             /(tizen)\/([\w\.]+)/i,                                              // Tizen
             /(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i
                                                                                 // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo
-            ], ['name', 'version'], [
+            ], [NAME, VERSION], [
             /(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]+)*/i                 // Symbian
-            ], [['name', 'Symbian'], 'version'],[
+            ], [[NAME, 'Symbian'], VERSION],[
+            /mozilla.+\(mobile;.+gecko.+firefox/i                               // Firefox OS
+            ], [[NAME, 'Firefox OS'], VERSION], [
 
+            // Console
             /(nintendo|playstation)\s([wids3portablev]+)/i,                     // Nintendo/Playstation
 
             // GNU/Linux based
@@ -296,38 +345,38 @@
                                                                                 // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk
             /(hurd|linux)\s?([\w\.]+)*/i,                                       // Hurd/Linux
             /(gnu)\s?([\w\.]+)*/i                                               // GNU
-            ], ['name', 'version'], [
+            ], [NAME, VERSION], [
 
             /(cros)\s[\w]+\s([\w\.]+\w)/i                                       // Chromium OS
-            ], [['name', 'Chromium OS'], 'version'],[
+            ], [[NAME, 'Chromium OS'], VERSION],[
 
             // Solaris
             /(sunos)\s?([\w\.]+\d)*/i                                           // Solaris
-            ], [['name', 'Solaris'], 'version'], [
+            ], [[NAME, 'Solaris'], VERSION], [
 
             // BSD based
-            /\s(\w*bsd|dragonfly)\s?([\w\.]+)*/i,                               // FreeBSD/NetBSD/OpenBSD/DragonFly
+            /\s(\w*bsd|dragonfly)\s?([\w\.]+)*/i                                // FreeBSD/NetBSD/OpenBSD/DragonFly
-            ], ['name', 'version'],[
+            ], [NAME, VERSION],[
 
-            /(ip[honead]+).*os\s*([\w]+)*\slike\smac/i                          // iOS
+            /(ip[honead]+)(?:.*os\s*([\w]+)*\slike\smac|;\sopera)/i             // iOS
-            ], [['name', 'iOS'], ['version', /_/g, '.']], [
+            ], [[NAME, 'iOS'], [VERSION, /_/g, '.']], [
 
-            /(mac\sos\sx)\s?([\w\s\.]+\w)*/i,                                   // Mac OS
+            /(mac\sos\sx)\s?([\w\s\.]+\w)*/i                                    // Mac OS
-            ], ['name', ['version', /_/g, '.']], [
+            ], [NAME, [VERSION, /_/g, '.']], [
 
             // Other
             /(haiku)\s(\w+)/i,                                                  // Haiku
             /(aix)\s((\d)(?=\.|\)|\s)[\w\.]*)*/i,                               // AIX
-            /(macintosh|mac(?=_powerpc)|plan\s9|minix|beos|qnx|os\/2|amigaos|morphos)/i,
+            /(macintosh|mac(?=_powerpc)|plan\s9|minix|beos|os\/2|amigaos|morphos|risc\sos)/i,
-                                                                                // Plan9/Minix/BeOS/QNX/OS2/AmigaOS/MorphOS
+                                                                                // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS/RISCOS
             /(unix)\s?([\w\.]+)*/i                                              // UNIX
-            ], ['name', 'version']
+            ], [NAME, VERSION]
         ]
     };
 
     var UAParser = function UAParser (uastring) {
 
-        var ua = uastring || ((global && global.navigator && global.navigator.userAgent) ? global.navigator.userAgent : "");
+        var ua = uastring || ((global && global.navigator && global.navigator.userAgent) ? global.navigator.userAgent : EMPTY);
 
         this.getBrowser = function () {
             return mapper.regex.apply(this, regexes.browser);
@@ -367,14 +416,34 @@
     };
 
     // check js environment    
-    if (typeof exports !== 'undefined' && !/\[object\s[DOM]*Window\]/.test(global.toString())) {
+    if (typeof exports !== UNDEF && !/\[object\s[DOM]*Window\]/.test(global.toString())) {
         // nodejs env
-        if (typeof module !== 'undefined' && module.exports) {
+        if (typeof module !== UNDEF && module.exports) {
             exports = module.exports = UAParser;
         }
         exports.UAParser = UAParser;
+    } else if (typeof define === FUNC && define.amd) {
+        // requirejs env
+        define(function() {
+            return UAParser;
+        });
     } else {
         // browser env
-        global['UAParser'] = UAParser;
+        global.UAParser = UAParser;
+        // jQuery specific
+        if (typeof global.jQuery !== UNDEF) {
+            var parser = new UAParser();
+            global.jQuery.ua = parser.getResult();
+            global.jQuery.ua.get = function() {
+                return parser.getUA();
+            };
+            global.jQuery.ua.set = function(uastring) {
+                parser.setUA(uastring);
+                var result = parser.getResult();
+                for (var prop in result) {
+                    global.jQuery.ua[prop] = result[prop];
+                }
+            };
+        }
     }
 })(this);