Add a test for issue #8

Fix google closure compiler JSC_TRAILING_COMMA errors

.gitignore

@@ -0,0 +1,2 @@
+node_modules/
+npm-debug.log

.travis.yml

@@ -0,0 +1,8 @@
+language: node_js
+node_js:
+  - 0.8
+  - 0.6
+notifications:
+  email:
+    on_success: never
+    on_failure: always

package.json

@@ -1,7 +1,7 @@
 {
   "title": "UA-Parser.JS",
   "name": "ua-parser-js",
-  "version": "0.4.8",
+  "version": "0.5.0",
   "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
   "description": "Lightweight JavaScript-based user-agent string parser",
   "keywords": [
@@ -17,6 +17,14 @@
     "Faisal Salman <fyzlman@gmail.com>"
   ],
   "main": "ua-parser",
+  "scripts": {
+    "test": "./node_modules/mocha/bin/mocha -R spec",
+    "pretest": "./node_modules/uglify-js/bin/uglifyjs ua-parser.js > ua-parser.min.js"
+  },
+  "devDependencies": {
+    "mocha": ">= 1.7.1",
+    "uglify-js": ">= 1.3.4"
+  },
   "repositories": [
     {
       "type": "git",

readme.md

@@ -2,6 +2,8 @@
 
 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
@@ -11,6 +13,8 @@ Lightweight JavaScript-based User-Agent string parser
 
 Extract detailed type of web browser, layout engine, operating system, and device purely from user-agent string.
 
+![It's over 9000](https://pbs.twimg.com/media/A9LpEG6CIAA5VrT.jpg)
+
 ## Methods
 
 * `getBrowser()`
@@ -73,6 +77,10 @@ Extract detailed type of web browser, layout engine, operating system, and devic
 
 ## Using node.js
 
+```sh
+$ npm install ua-parser-js
+```
+
 ```js
 var UAParser    = require('ua-parser');
 var parser      = new UAParser();

ua-parser.js

@@ -1,13 +1,27 @@
-// UA-Parser.JS v0.4.8
+// UA-Parser.JS v0.5.1
 // Lightweight JavaScript-based User-Agent string parser
 // https://github.com/faisalman/ua-parser-js
 //
 // Copyright © 2012 Faisalman
 // Dual licensed under GPLv2 & MIT
 
-(function (undefined) {
+(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 = {
 
@@ -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,13 +97,14 @@
     };
 
     var maps = {
-        browser : {
+        
-            oldsafari : {
+        browser : {        
+            oldsafari : {            
                 major : {
                     '1' : ['/85', '/125', '/312'],
                     '2' : ['/412', '/416', '/417', '/419'],
                     'undefined' : '/'
-                },
+                },                
                 version : {
                     '1.0'   : '/85',
                     '1.2'   : '/125',
@@ -102,8 +117,17 @@
                 }
             }
         },
-        os : {
+        
-            windows : {
+        device : {        
+            htc : {            
+                model : {
+                    'Evo Shift 4G' : '7373KT'
+                }
+            }
+        },
+        
+        os : {        
+            windows : {            
                 version : {
                     'ME'        : '4.90',
                     'NT 3.11'   : 'NT3.51',
@@ -112,7 +136,8 @@
                     'XP'        : ['NT 5.1', 'NT 5.2'],
                     'Vista'     : 'NT 6.0',
                     '7'         : 'NT 6.1',
-                    '8'         : 'NT 6.2'
+                    '8'         : 'NT 6.2',
+                    'RT'        : 'ARM'
                 }
             }
         }
@@ -124,13 +149,13 @@
 
             // Presto based
             /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
-            /(opera\smobi)\/((\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
 
             // 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
@@ -139,179 +164,197 @@
             /ms(ie)\s((\d+)?[\w\.]+)/i,                                         // Internet Explorer
 
             // Webkit/KHTML based
-            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|s60|series60|ovibrowser|bolt)\/((\d+)?[\w\.]+)/i,
+            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt)\/((\d+)?[\w\.-]+)/i
-                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/S60/Bolt
+                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt
-            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?((\d+)?[\w\.]+)/i,
+            ], [NAME, VERSION, MAJOR], [
-                                                                                // Chrome/OmniWeb/Arora/Tizen/Nokia
-            ], ['name', 'version', 'major'], [
-            
-            /(dolfin)\/((\d+)?[\w\.]+)/i                                        // Dolphin
-            ], [['name', 'Dolphin'], 'version', 'major'], [
             
             /(yabrowser)\/((\d+)?[\w\.]+)/i                                     // Yandex
-            ], [['name', 'Yandex'], 'version', 'major'], [
+            ], [[NAME, 'Yandex'], VERSION, MAJOR], [
             
-            /(?:android.+(crmo|crios))\/((\d+)?[\w\.]+)/i,                      // Chrome for Android/iOS
+            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?((\d+)?[\w\.]+)/i
-            ], [['name', 'Chrome'], 'version', 'major'], [
+                                                                                // Chrome/OmniWeb/Arora/Tizen/Nokia
+            ], [NAME, VERSION, MAJOR], [
             
-            /version\/((\d+)?[\w\.]+).+(mobile\s?safari|safari)/i               // Safari & Safari Mobile
+            /(dolfin)\/((\d+)?[\w\.]+)/i                                        // Dolphin
-            ], ['version', 'major', 'name'], [
+            ], [[NAME, 'Dolphin'], VERSION, MAJOR], [
             
-            /applewebkit.+(mobile\s?safari|safari)((\/[\w\.]+))/i               // Safari < 3.0
+            /((?:android.+)crmo|crios)\/((\d+)?[\w\.]+)/i                       // Chrome for Android/iOS
-            ], ['name', ['major', mapper.string, maps.browser.oldsafari.major], ['version', mapper.string, maps.browser.oldsafari.version]], [
+            ], [[NAME, 'Chrome'], VERSION, MAJOR], [
+            
+            /version\/((\d+)?[\w\.]+).+?mobile\/\w+\s(safari)/i                 // Mobile Safari
+            ], [VERSION, MAJOR, [NAME, 'Mobile Safari']], [
+            
+            /version\/((\d+)?[\w\.]+).+?(mobile\s?safari|safari)/i              // Safari & Safari Mobile
+            ], [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]], [
             
             /(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|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
-            /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i,                          // Mozilla
+            /(mozilla)\/((\d+)?[\w\.]+).+rv\:.+gecko\/\d+/i,                    // Mozilla
 
             // Other
-            /(uc\s?browser)\/?((\d+)?[\w\.]+)/i,                                // UCBrowser
+            /(uc\s?browser|polaris|lynx|dillo|icab|doris)[\/\s]?((\d+)?[\w\.]+)/i,
-            /(lynx|dillo|icab|doris)[\/\s]?((\d+)?[\w\.]+)/i,                   // Lynx/Dillo/iCab/Doris
+                                                                                // UCBrowser/Polaris/Lynx/Dillo/iCab/Doris
-            /(gobrowser)\/?[\d\.]*/i,                                           // GoBrowser
+            /(gobrowser)\/?((\d+)?[\w\.]+)*/i,                                  // GoBrowser
-            /(mosaic)[\/\s]((\d+)?[\w\.]+)/i                        
+            /(mosaic)[\/\s]((\d+)?[\w\.]+)/i                                    // Mosaic
-                                                                                // 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]], [
 
             /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\sapa)(\w+)/i
+            ], [[VENDOR, 'HTC'], [MODEL, mapper.string, maps.device.htc.model], [TYPE, MOBILE]], [
             /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i,                               // HTC
+            
             /(zte)-(\w+)*/i                                                     // ZTE
-            ], ['vendor', ['model', /_/g, ' '], ['type', 'Mobile']], [
+            ], [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)\/([\w\.]+)/i,                            // WebKit/Trident/NetFront
-            /(khtml)\/([\w\.]+)/i                                               // KHTML
+            /(khtml)\/([\w\.]+)/i,                                              // KHTML
-            ], ['name', 'version'], [
+            /(tasman)\s([\w\.]+)/i                                              // Tasman
+            ], [NAME, VERSION], [
 
             /rv\:([\w\.]+).*(gecko)/i                                           // Gecko
-            ], ['version', 'name']
+            ], [VERSION, NAME]
         ],
 
         os : [[
 
             // Windows based
-            /(windows\sphone\sos|windows\s?[mobile]*)[\s\/]?([ntce\d\.\s]+\w)/i // Windows
+            /(windows)\snt\s6\.2;\s(arm)/i,                                     // Windows RT
-            ], ['name', ['version', mapper.string, maps.os.windows.version]], [
+            /(windows\sphone\sos|windows\smobile|windows)[\s\/]?([ntce\d\.\s]+\w)/i
+            ], [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
-            /(blackberry).+version\/([\w\.]+)/i,                                // Blackberry
+            /\((bb)(10);/i                                                      // BlackBerry 10
+            ], [[NAME, 'BlackBerry'], VERSION], [
+            /(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],[
 
-            /(nintendo|playstation)\s([wids3portable]+)/i,                      // Nintendo/Playstation
+            /(nintendo|playstation)\s([wids3portablev]+)/i,                     // Nintendo/Playstation
 
             // GNU/Linux based
             /(mint)[\/\s\(]?(\w+)*/i,                                           // Mint
             /(joli|[kxln]?ubuntu|debian|[open]*suse|gentoo|arch|slackware|fedora|mandriva|centos|pclinuxos|redhat|zenwalk)[\/\s-]?([\w\.-]+)*/i,
                                                                                 // Joli/Ubuntu/Debian/SUSE/Gentoo/Arch/Slackware
                                                                                 // Fedora/Mandriva/CentOS/PCLinuxOS/RedHat/Zenwalk
-            /(gnu|linux)\s?([\w\.]+)*/i                                         // Other GNU/Linux
+            /(hurd|linux)\s?([\w\.]+)*/i,                                       // Hurd/Linux
-            ], ['name', 'version'], [
+            /(gnu)\s?([\w\.]+)*/i                                               // GNU
+            ], [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?([\d\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)[\/\s]?()*/i,
+            /(macintosh|mac(?=_powerpc)|plan\s9|minix|beos|os\/2|amigaos|morphos)/i,
-                                                                                // Plan9/Minix/BeOS/QNX/OS2
+                                                                                // Plan9/Minix/BeOS/OS2/AmigaOS/MorphOS
             /(unix)\s?([\w\.]+)*/i                                              // UNIX
-            ], ['name', 'version']
+            ], [NAME, VERSION]
         ]
     };
 
     var UAParser = function UAParser (uastring) {
 
-        var ua = uastring || ((window && window.navigator && window.navigator.userAgent) ? window.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);
@@ -350,13 +393,15 @@
         this.setUA(ua);
     };
 
-    // check whether script is running inside node.js export as module
+    // check js environment    
-    if (typeof exports !== 'undefined' && this.toString() !== '[object DOMWindow]') {
+    if (typeof exports !== UNDEF && !/\[object\s[DOM]*Window\]/.test(global.toString())) {
-        if (typeof module !== 'undefined' && module.exports) {
+        // nodejs env
+        if (typeof module !== UNDEF && module.exports) {
             exports = module.exports = UAParser;
         }
         exports.UAParser = UAParser;
     } else {
-        window['UAParser'] = UAParser;
+        // browser env
+        global['UAParser'] = UAParser;
     }
-})();
+})(this);