Fix #111

Merge pull request #110 from duzun/master
Added a script to bump version in project files. Fix #107
2025-11-19 00:42:28 +03:00 · 2015-04-29 11:29:54 +07:00 · 2015-04-28 13:39:17 +07:00 · 2015-04-20 14:24:20 +03:00 · 2015-04-20 14:19:37 +03:00 · 2015-04-19 13:56:17 +07:00
13 changed files with 637 additions and 213 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ npm-debug.log
 Session.vim
 .netrwhist
 *~
+.versions

 ### OSX ###
 .DS_Store
--- a/bower.json
+++ b/bower.json
@@ -1,45 +1,43 @@
 {
-    "name": "ua-parser-js",
-    "version": "0.7.3",
-    "authors": [
-        "Faisal Salman <fyzlman@gmail.com>"
-    ],
-    "private": false,
-    "main": "src/ua-parser.js",
-    "ignore": [
-        "build",
-        "node_modules",
-        "bower_components",
-        "test",
-        "tests"
-    ],
-    "contributors": [
-        "Faisal Salman <fyzlman@gmail.com>",
-        "Benjamin Bertrand <bertrand.design@gmail.com>",
-        "Carl C Von Lewin <carlchristianlewin@gmail.com>",
-        "Christopher De Cairos <chris.decairos@gmail.com>",
-        "Davit Barbakadze <jayarjo@gmail.com>",
-        "Dmitry Tyschenko <dtyschenko@gmail.com>",
-        "Douglas Li <doug@knotch.it>",
-        "Dumitru Uzun <duzun@mail.ru>",
-        "Erik Hesselink <hesselink@gmail.com>",
-        "Fabian Becker <halfdan@xnorfz.de>",
-        "Hendrik Helwich <h.helwich@iplabs.de>",
-        "Jackpoll <jackpoll123456@gmail.com>",
-        "Jake Mc <startswithaj@users.noreply.github.com>",
-        "John Tantalo <john.tantalo@gmail.com>",
-        "John Yanarella <jmy@codecatalyst.com>",
-        "Jon Buckley <jon@jbuckley.ca>",
-        "Kendall Buchanan <kendall@kendagriff.com>",
-        "Lee Treveil <leetreveil@gmail.com>",
-        "Leonardo <leofiore@libero.it>",
-        "Max Maurer <maxemanuel.maurer@gmail.com>",
-        "Michael Hess <mhess@connectify.me>",
-        "OtakuSiD <otakusid@gmail.com>",
-        "Ross Noble <rosshnoble@gmail.com>",
-        "Sandro Sonntag <sandro.sonntag@adorsys.de>"
-    ],
-    "dependencies": {
-
-    }
+  "name": "ua-parser-js",
+  "version": "0.7.7",
+  "authors": [
+    "Faisal Salman <fyzlman@gmail.com>"
+  ],
+  "private": false,
+  "main": "src/ua-parser.js",
+  "ignore": [
+    "build",
+    "node_modules",
+    "bower_components",
+    "test",
+    "tests"
+  ],
+  "contributors": [
+    "Faisal Salman <fyzlman@gmail.com>",
+    "Benjamin Bertrand <bertrand.design@gmail.com>",
+    "Carl C Von Lewin <carlchristianlewin@gmail.com>",
+    "Christopher De Cairos <chris.decairos@gmail.com>",
+    "Davit Barbakadze <jayarjo@gmail.com>",
+    "Dmitry Tyschenko <dtyschenko@gmail.com>",
+    "Douglas Li <doug@knotch.it>",
+    "Dumitru Uzun <duzun@mail.ru>",
+    "Erik Hesselink <hesselink@gmail.com>",
+    "Fabian Becker <halfdan@xnorfz.de>",
+    "Hendrik Helwich <h.helwich@iplabs.de>",
+    "Jackpoll <jackpoll123456@gmail.com>",
+    "Jake Mc <startswithaj@users.noreply.github.com>",
+    "John Tantalo <john.tantalo@gmail.com>",
+    "John Yanarella <jmy@codecatalyst.com>",
+    "Jon Buckley <jon@jbuckley.ca>",
+    "Kendall Buchanan <kendall@kendagriff.com>",
+    "Lee Treveil <leetreveil@gmail.com>",
+    "Leonardo <leofiore@libero.it>",
+    "Max Maurer <maxemanuel.maurer@gmail.com>",
+    "Michael Hess <mhess@connectify.me>",
+    "OtakuSiD <otakusid@gmail.com>",
+    "Ross Noble <rosshnoble@gmail.com>",
+    "Sandro Sonntag <sandro.sonntag@adorsys.de>"
+  ],
+  "dependencies": {}
 }
--- a/build/verup.js
+++ b/build/verup.js
@@ -0,0 +1,112 @@
+#!/usr/bin/env node
+/**
+ * Increment and update version in all project files.
+ *
+ * Ussage:
+ *
+ *  Increment revision by 1:
+ *      node verup.js 1
+ *
+ *  Increment minor version by 1:
+ *      node verup.js 1.0
+ *
+ *  Increment major version by 1:
+ *      node verup.js 1.0.0
+ *
+ *
+ * @author Dumitru Uzun (DUzun.Me)
+ * @version 1.1.0
+ */
+
+var path = require('path');
+var fs   = require('fs');
+
+var _root = path.join(__dirname, '..');
+var files = [
+    'ua-parser-js.jquery.json',
+    'component.json',
+    'bower.json',
+    'package.js',
+    'src/ua-parser.js'
+];
+
+var ver_reg = [
+    /^((?:\$|@|(\s*(?:var|,)?\s+))(?:LIBVERSION|version)[\s\:='"]+)([0-9]+(?:\.[0-9]+){2,2})/
+  , /^(\s?\*.*v)([0-9]+(?:\.[0-9]+){2,2})/
+];
+
+var packFile = path.join(_root, 'package.json');
+var packo = require(packFile);
+
+if ( !packo ) {
+    console.error('Can\'t read package.json file');
+    process.exit(1);
+}
+
+var over = packo.version;
+
+/*
+ * bump should be 1 for revision, 1.0 for minor and 1.0.0 for major version
+ */
+var bump = (process.argv[2] || '1').split('.').reverse();
+
+if ( over ) {
+    var nver = over.split('.').reverse();
+    var b, l;
+    while(bump.length && !(b = parseInt(bump.pop())));
+    l = bump.length;
+
+// console.log({b:b,nver:nver,over:over,l:l,bump:bump})
+    nver[l] = +nver[l] + b;
+    bump.forEach(function (v,i) { nver[i] = v; });
+
+    nver = nver.reverse().join('.');
+    packo.version = nver;
+
+    console.log('Bumping version: ' + over + ' -> ' + nver);
+
+    var buf = JSON.stringify(packo, null, 2);
+
+    if ( buf && over != nver ) {
+        buf += "\n";
+        fs.writeFileSync(packFile, buf);
+    }
+
+    files.forEach(function (f) {
+        var fn = path.join(_root, f);
+        var cnt = fs.readFileSync(fn, 'utf8');
+        var ext = path.extname(f);
+        var buf;
+
+        switch(ext) {
+            case '.json': {
+                var packo = JSON.parse(cnt);
+                packo.version = nver;
+                buf = JSON.stringify(packo, null, 2);
+                if ( buf ) {
+                    buf += "\n";
+                }
+            } break;
+
+            default: {
+                buf = cnt
+                    .split('\n')
+                    .map(function (l) {
+                        for(var i=ver_reg.length; i--;) {
+                            if ( ver_reg[i].test(l) ) {
+                                return l.replace(ver_reg[i], function ($0,$1) { return $1 + nver })
+                            }
+                        }
+                        return l;
+                    })
+                    .join("\n")
+                ;
+            }
+        }
+        if ( buf && buf != cnt ) {
+            console.log("\t" + fn.replace(_root, ''));
+            fs.writeFileSync(fn, buf);
+        }
+    });
+
+}
--- a/component.json
+++ b/component.json
@@ -1,9 +1,19 @@
 {
  "name": "ua-parser-js",
-  "version": "0.7.3",
+  "version": "0.7.7",
  "description": "Lightweight JavaScript-based user-agent string parser",
-  "keywords": ["user-agent", "parser", "browser", "engine", "os", "device", "cpu"],
-  "scripts": ["src/ua-parser.js"],
+  "keywords": [
+    "user-agent",
+    "parser",
+    "browser",
+    "engine",
+    "os",
+    "device",
+    "cpu"
+  ],
+  "scripts": [
+    "src/ua-parser.js"
+  ],
  "main": "src/ua-parser.js",
  "license": "MIT",
  "development": {
--- a/dist/ua-parser.min.js
+++ b/dist/ua-parser.min.js
--- a/package.js
+++ b/package.js
@@ -0,0 +1,12 @@
+Package.describe({
+  name: 'faisalman:ua-parser-js',
+  version: '0.7.7',
+  summary: 'Lightweight JavaScript-based user-agent string parser',
+  git: 'https://github.com/faisalman/ua-parser-js.git',
+  documentation: 'readme.md'
+});
+
+Package.on_use(function (api) {
+  api.export("UAParser");
+  api.addFiles("src/ua-parser.js");
+});
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "title": "UAParser.js",
  "name": "ua-parser-js",
-  "version": "0.7.3",
+  "version": "0.7.7",
  "author": "Faisal Salman <fyzlman@gmail.com> (http://faisalman.com)",
  "description": "Lightweight JavaScript-based user-agent string parser",
  "keywords": [
@@ -22,7 +22,7 @@
    "Davit Barbakadze <jayarjo@gmail.com>",
    "Dmitry Tyschenko <dtyschenko@gmail.com>",
    "Douglas Li <doug@knotch.it>",
-    "Dumitru Uzun <duzun@mail.ru>",
+    "Dumitru Uzun <contact@duzun.me>",
    "Erik Hesselink <hesselink@gmail.com>",
    "Fabian Becker <halfdan@xnorfz.de>",
    "Hendrik Helwich <h.helwich@iplabs.de>",
@@ -42,14 +42,15 @@
  ],
  "main": "src/ua-parser.js",
  "scripts": {
-    "test": "./build/build.sh"
+    "test": "./build/build.sh",
+    "verup": "node ./build/verup.js"
  },
  "devDependencies": {
    "jshint": "~1.1.0",
    "mocha": "~1.8.0",
    "uglify-js": "~1.3.4"
  },
-  "repository" : {
+  "repository": {
    "type": "git",
    "url": "https://github.com/faisalman/ua-parser-js.git"
  },
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,6 @@
 # UAParser.js

-Lightweight JavaScript-based User-Agent string parser. Supports browser & node.js environment. Also available as jQuery/Zepto plugin, Component package, Bower package, & AMD module
+Lightweight JavaScript-based User-Agent string parser. Supports browser & node.js environment. Also available as jQuery/Zepto plugin, Component package, Bower package, Meteor package, & AMD module

 [![Build Status](https://travis-ci.org/faisalman/ua-parser-js.svg?branch=master)](https://travis-ci.org/faisalman/ua-parser-js)

@@ -21,14 +21,14 @@ Extract detailed type of web browser, layout engine, operating system, cpu archi

 ```
 # Possible 'browser.name':
-Amaya, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome, Chromium, 
-Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Epiphany, Fennec, Firebird, 
+Amaya, Android Browser, Arora, Avant, Baidu, Blazer, Bolt, Camino, Chimera, Chrome, 
+Chromium, Comodo Dragon, Conkeror, Dillo, Dolphin, Doris, Epiphany, Fennec, Firebird, 
 Firefox, Flock, GoBrowser, iCab, ICE Browser, IceApe, IceCat, IceDragon, 
 Iceweasel, IE [Mobile], Iron, Jasmine, K-Meleon, Konqueror, Kindle, Links, 
-Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, [Mobile] Safari, Mosaic, Mozilla, 
-Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet], Phoenix, 
-Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser, Swiftfox, 
-Tizen, UCBrowser, w3m, Yandex
+Lunascape, Lynx, Maemo, Maxthon, Midori, Minimo, MIUI Browser, [Mobile] Safari, 
+Mosaic, Mozilla, Netfront, Netscape, NetSurf, Nokia, OmniWeb, Opera [Mini/Mobi/Tablet], 
+Phoenix, Polaris, QQBrowser, RockMelt, Silk, Skyfire, SeaMonkey, SlimBrowser, Swiftfox, 
+Tizen, UCBrowser, Vivaldi, w3m, Yandex

 # 'browser.version' & 'browser.major' determined dynamically
 ```
@@ -221,6 +221,12 @@ console.log(parser.getResult());
 $ bower install ua-parser-js
 ```

+### Using meteor
+
+```sh
+$ meteor add faisalman:ua-parser-js
+```
+
 ### Using jQuery/Zepto ($.ua)

 Although written in vanilla js (which means it doesn't depends on jQuery), this library will automatically detect if jQuery/Zepto is present and create `$.ua` object based on browser's user-agent (although in case you need, `window.UAParser` constructor is still present). To get/set user-agent you can use: `$.ua.get()` / `$.ua.set(uastring)`. 
@@ -259,7 +265,7 @@ Then submit a pull request to https://github.com/faisalman/ua-parser-js under `d

 Dual licensed under GPLv2 & MIT

-Copyright © 2012-2014 Faisal Salman <<fyzlman@gmail.com>>
+Copyright © 2012-2015 Faisal Salman <<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 
--- a/src/ua-parser.js
+++ b/src/ua-parser.js
@@ -1,9 +1,9 @@
 /**
- * UAParser.js v0.7.3
+ * UAParser.js v0.7.7
 * Lightweight JavaScript-based User-Agent string parser
 * https://github.com/faisalman/ua-parser-js
 *
- * Copyright © 2012-2014 Faisal Salman <fyzlman@gmail.com>
+ * Copyright © 2012-2015 Faisal Salman <fyzlman@gmail.com>
 * Dual licensed under GPLv2 & MIT
 */

@@ -16,13 +16,14 @@
    /////////////


-    var LIBVERSION  = '0.7.3',
+    var LIBVERSION  = '0.7.7',
        EMPTY       = '',
        UNKNOWN     = '?',
        FUNC_TYPE   = 'function',
        UNDEF_TYPE  = 'undefined',
        OBJ_TYPE    = 'object',
-        MAJOR       = 'major',
+        STR_TYPE    = 'string',
+        MAJOR       = 'major', // deprecated
        MODEL       = 'model',
        NAME        = 'name',
        TYPE        = 'type',
@@ -54,10 +55,15 @@
        has : function (str1, str2) {
          if (typeof str1 === "string") {
            return str2.toLowerCase().indexOf(str1.toLowerCase()) !== -1;
+          } else {
+            return false;
          }
        },
        lowerize : function (str) {
            return str.toLowerCase();
+        },
+        major : function (version) {
+            return typeof(version) === STR_TYPE ? version.split(".")[0] : undefined;
        }
    };

@@ -80,11 +86,11 @@
                    props = args[i + 1];   // odd sequence (1,3,5,..)

                // construct object barebones
-                if (typeof(result) === UNDEF_TYPE) {
+                if (typeof result === UNDEF_TYPE) {
                    result = {};
                    for (p in props) {
                        q = props[p];
-                        if (typeof(q) === OBJ_TYPE) {
+                        if (typeof q === OBJ_TYPE) {
                            result[q[0]] = undefined;
                        } else {
                            result[q] = undefined;
@@ -101,9 +107,9 @@
                            match = matches[++k];
                            q = props[p];
                            // check if given property is actually array
-                            if (typeof(q) === OBJ_TYPE && q.length > 0) {
+                            if (typeof q === OBJ_TYPE && q.length > 0) {
                                if (q.length == 2) {
-                                    if (typeof(q[1]) == FUNC_TYPE) {
+                                    if (typeof q[1] == FUNC_TYPE) {
                                        // assign modified match
                                        result[q[0]] = q[1].call(this, match);
                                    } else {
@@ -112,7 +118,7 @@
                                    }
                                } else if (q.length == 3) {
                                    // check whether function or regex
-                                    if (typeof(q[1]) === FUNC_TYPE && !(q[1].exec && q[1].test)) {
+                                    if (typeof q[1] === FUNC_TYPE && !(q[1].exec && q[1].test)) {
                                        // call function (usually string mapper)
                                        result[q[0]] = match ? q[1].call(this, match, q[2]) : undefined;
                                    } else {
@@ -137,7 +143,7 @@

            for (var i in map) {
                // check if array
-                if (typeof(map[i]) === OBJ_TYPE && map[i].length > 0) {
+                if (typeof map[i] === OBJ_TYPE && map[i].length > 0) {
                    for (var j = 0; j < map[i].length; j++) {
                        if (util.has(map[i][j], str)) {
                            return (i === UNKNOWN) ? undefined : i;
@@ -161,11 +167,6 @@

        browser : {
            oldsafari : {
-                major : {
-                    '1' : ['/8', '/1', '/3'],
-                    '2' : '/4',
-                    '?' : '/'
-                },
                version : {
                    '1.0'   : '/8',
                    '1.2'   : '/1',
@@ -208,7 +209,7 @@
                    '7'         : 'NT 6.1',
                    '8'         : 'NT 6.2',
                    '8.1'       : 'NT 6.3',
-                    '10'        : 'NT 6.4',
+                    '10'        : ['NT 6.4', 'NT 10.0'],
                    'RT'        : 'ARM'
                }
            }
@@ -226,84 +227,94 @@
        browser : [[

            // Presto based
-            /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
-            /(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
+            /(opera\smini)\/([\w\.-]+)/i,                                       // Opera Mini
+            /(opera\s[mobiletab]+).+version\/([\w\.-]+)/i,                      // Opera Mobi/Tablet
+            /(opera).+version\/([\w\.]+)/i,                                     // Opera > 9.80
+            /(opera)[\/\s]+([\w\.]+)/i                                          // Opera < 9.80

-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

-            /\s(opr)\/((\d+)?[\w\.]+)/i                                         // Opera Webkit
-            ], [[NAME, 'Opera'], VERSION, MAJOR], [
+            /\s(opr)\/([\w\.]+)/i                                               // Opera Webkit
+            ], [[NAME, 'Opera'], VERSION], [

            // Mixed
-            /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
-            /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?((\d+)?[\w\.]+)*/i,
+            /(kindle)\/([\w\.]+)/i,                                             // Kindle
+            /(lunascape|maxthon|netfront|jasmine|blazer)[\/\s]?([\w\.]+)*/i,
                                                                                // Lunascape/Maxthon/Netfront/Jasmine/Blazer

            // Trident based
-            /(avant\s|iemobile|slim|baidu)(?:browser)?[\/\s]?((\d+)?[\w\.]*)/i,
+            /(avant\s|iemobile|slim|baidu)(?:browser)?[\/\s]?([\w\.]*)/i,
                                                                                // Avant/IEMobile/SlimBrowser/Baidu
-            /(?:ms|\()(ie)\s((\d+)?[\w\.]+)/i,                                  // Internet Explorer
+            /(?:ms|\()(ie)\s([\w\.]+)/i,                                        // Internet Explorer

            // Webkit/KHTML based
-            /(rekonq)((?:\/)[\w\.]+)*/i,                                        // Rekonq
-            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron)\/((\d+)?[\w\.-]+)/i
+            /(rekonq)\/([\w\.]+)*/i,                                            // Rekonq
+            /(chromium|flock|rockmelt|midori|epiphany|silk|skyfire|ovibrowser|bolt|iron|vivaldi)\/([\w\.-]+)/i
                                                                                // Chromium/Flock/RockMelt/Midori/Epiphany/Silk/Skyfire/Bolt/Iron
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

-            /(trident).+rv[:\s]((\d+)?[\w\.]+).+like\sgecko/i                   // IE11
-            ], [[NAME, 'IE'], VERSION, MAJOR], [
+            /(trident).+rv[:\s]([\w\.]+).+like\sgecko/i,                        // IE11
+            /(Edge)\/((\d+)?[\w\.]+)/i                                          // IE12
+            ], [[NAME, 'IE'], VERSION], [

-            /(yabrowser)\/((\d+)?[\w\.]+)/i                                     // Yandex
-            ], [[NAME, 'Yandex'], VERSION, MAJOR], [
+            /(yabrowser)\/([\w\.]+)/i                                           // Yandex
+            ], [[NAME, 'Yandex'], VERSION], [

-            /(comodo_dragon)\/((\d+)?[\w\.]+)/i                                 // Comodo Dragon
-            ], [[NAME, /_/g, ' '], VERSION, MAJOR], [ 
+            /(comodo_dragon)\/([\w\.]+)/i                                       // Comodo Dragon
+            ], [[NAME, /_/g, ' '], VERSION], [

-            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?((\d+)?[\w\.]+)/i,
+            /(chrome|omniweb|arora|[tizenoka]{5}\s?browser)\/v?([\w\.]+)/i,
                                                                                // Chrome/OmniWeb/Arora/Tizen/Nokia
-            /(uc\s?browser|qqbrowser)[\/\s]?((\d+)?[\w\.]+)/i
-                                                                                //UCBrowser/QQBrowser
-            ], [NAME, VERSION, MAJOR], [
+            /(uc\s?browser|qqbrowser)[\/\s]?([\w\.]+)/i
+                                                                                // UCBrowser/QQBrowser
+            ], [NAME, VERSION], [

-            /(dolfin)\/((\d+)?[\w\.]+)/i                                        // Dolphin
-            ], [[NAME, 'Dolphin'], VERSION, MAJOR], [
+            /(dolfin)\/([\w\.]+)/i                                              // Dolphin
+            ], [[NAME, 'Dolphin'], VERSION], [

-            /((?:android.+)crmo|crios)\/((\d+)?[\w\.]+)/i                       // Chrome for Android/iOS
-            ], [[NAME, 'Chrome'], VERSION, MAJOR], [
+            /((?:android.+)crmo|crios)\/([\w\.]+)/i                             // Chrome for Android/iOS
+            ], [[NAME, 'Chrome'], VERSION], [

-            /version\/((\d+)?[\w\.]+).+?mobile\/\w+\s(safari)/i                 // Mobile Safari
-            ], [VERSION, MAJOR, [NAME, 'Mobile Safari']], [
+            /XiaoMi\/MiuiBrowser\/([\w\.]+)/i                                   // MIUI Browser
+            ], [VERSION, [NAME, 'MIUI Browser']], [

-            /version\/((\d+)?[\w\.]+).+?(mobile\s?safari|safari)/i              // Safari & Safari Mobile
-            ], [VERSION, MAJOR, NAME], [
+            /android.+version\/([\w\.]+)\s+(?:mobile\s?safari|safari)/i         // Android Browser
+            ], [VERSION, [NAME, 'Android Browser']], [

-            /webkit.+?(mobile\s?safari|safari)((\/[\w\.]+))/i                   // Safari < 3.0
-            ], [NAME, [MAJOR, mapper.str, maps.browser.oldsafari.major], [VERSION, mapper.str, maps.browser.oldsafari.version]], [
+            /FBAV\/([\w\.]+);/i                                                 // Facebook App for iOS
+            ], [VERSION, [NAME, 'Facebook']], [

-            /(konqueror)\/((\d+)?[\w\.]+)/i,                                    // Konqueror
-            /(webkit|khtml)\/((\d+)?[\w\.]+)/i
-            ], [NAME, VERSION, MAJOR], [
+            /version\/([\w\.]+).+?mobile\/\w+\s(safari)/i                       // Mobile Safari
+            ], [VERSION, [NAME, 'Mobile Safari']], [
+
+            /version\/([\w\.]+).+?(mobile\s?safari|safari)/i                    // Safari & Safari Mobile
+            ], [VERSION, NAME], [
+
+            /webkit.+?(mobile\s?safari|safari)(\/[\w\.]+)/i                     // Safari < 3.0
+            ], [NAME, [VERSION, mapper.str, maps.browser.oldsafari.version]], [
+
+            /(konqueror)\/([\w\.]+)/i,                                          // Konqueror
+            /(webkit|khtml)\/([\w\.]+)/i
+            ], [NAME, VERSION], [

            // Gecko based
-            /(navigator|netscape)\/((\d+)?[\w\.-]+)/i                           // Netscape
-            ], [[NAME, 'Netscape'], VERSION, MAJOR], [
+            /(navigator|netscape)\/([\w\.-]+)/i                                 // Netscape
+            ], [[NAME, 'Netscape'], VERSION], [
            /(swiftfox)/i,                                                      // Swiftfox
-            /(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?((\d+)?[\w\.\+]+)/i,
+            /(icedragon|iceweasel|camino|chimera|fennec|maemo\sbrowser|minimo|conkeror)[\/\s]?([\w\.\+]+)/i,
                                                                                // IceDragon/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)\/([\w\.-]+)/i,
                                                                                // Firefox/SeaMonkey/K-Meleon/IceCat/IceApe/Firebird/Phoenix
-            /(mozilla)\/((\d+)?[\w\.]+).+rv\:.+gecko\/\d+/i,                    // Mozilla
+            /(mozilla)\/([\w\.]+).+rv\:.+gecko\/\d+/i,                          // Mozilla

            // Other
-            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf)[\/\s]?((\d+)?[\w\.]+)/i,
+            /(polaris|lynx|dillo|icab|doris|amaya|w3m|netsurf)[\/\s]?([\w\.]+)/i,
                                                                                // 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]
+            /(links)\s\(([\w\.]+)/i,                                            // Links
+            /(gobrowser)\/?([\w\.]+)*/i,                                        // GoBrowser
+            /(ice\s?browser)\/v?([\w\._]+)/i,                                   // ICE Browser
+            /(mosaic)[\/\s]([\w\.]+)/i                                          // Mosaic
+            ], [NAME, VERSION]

            /* /////////////////////
            // Media players BEGIN
@@ -313,13 +324,13 @@

            /(apple(?:coremedia|))\/((\d+)[\w\._]+)/i,                          // Generic Apple CoreMedia
            /(coremedia) v((\d+)[\w\._]+)/i
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(aqualung|lyssna|bsplayer)\/((\d+)?[\w\.-]+)/i                     // Aqualung/Lyssna/BSPlayer
            ], [NAME, VERSION], [

            /(ares|ossproxy)\s((\d+)[\w\.-]+)/i                                 // Ares/OSSProxy
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(audacious|audimusicstream|amarok|bass|core|dalvik|gnomemplayer|music on console|nsplayer|psp-internetradioplayer|videos)\/((\d+)[\w\.-]+)/i,
                                                                                // Audacious/AudiMusicStream/Amarok/BASS/OpenCORE/Dalvik/GnomeMplayer/MoC
@@ -327,12 +338,12 @@
            /(clementine|music player daemon)\s((\d+)[\w\.-]+)/i,               // Clementine/MPD
            /(lg player|nexplayer)\s((\d+)[\d\.]+)/i,
            /player\/(nexplayer|lg player)\s((\d+)[\w\.-]+)/i                   // NexPlayer/LG Player
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [
            /(nexplayer)\s((\d+)[\w\.-]+)/i                                     // Nexplayer
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(flrp)\/((\d+)[\w\.-]+)/i                                          // Flip Player
-            ], [[NAME, 'Flip Player'], VERSION, MAJOR], [
+            ], [[NAME, 'Flip Player'], VERSION], [

            /(fstream|nativehost|queryseekspider|ia-archiver|facebookexternalhit)/i
                                                                                // FStream/NativeHost/QuerySeekSpider/IA Archiver/facebookexternalhit
@@ -340,23 +351,23 @@

            /(gstreamer) souphttpsrc (?:\([^\)]+\)){0,1} libsoup\/((\d+)[\w\.-]+)/i
                                                                                // Gstreamer
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(htc streaming player)\s[\w_]+\s\/\s((\d+)[\d\.]+)/i,              // HTC Streaming Player
            /(java|python-urllib|python-requests|wget|libcurl)\/((\d+)[\w\.-_]+)/i,
                                                                                // Java/urllib/requests/wget/cURL
            /(lavf)((\d+)[\d\.]+)/i                                             // Lavf (FFMPEG)
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(htc_one_s)\/((\d+)[\d\.]+)/i                                      // HTC One S
-            ], [[NAME, /_/g, ' '], VERSION, MAJOR], [
+            ], [[NAME, /_/g, ' '], VERSION], [

            /(mplayer)(?:\s|\/)(?:(?:sherpya-){0,1}svn)(?:-|\s)(r\d+(?:-\d+[\w\.-]+){0,1})/i
                                                                                // MPlayer SVN
            ], [NAME, VERSION], [

            /(mplayer)(?:\s|\/|[unkow-]+)((\d+)[\w\.-]+)/i                      // MPlayer
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(mplayer)/i,                                                       // MPlayer (no other info)
            /(yourmuze)/i,                                                      // YourMuze
@@ -364,18 +375,18 @@
            ], [NAME], [

            /(nero (?:home|scout))\/((\d+)[\w\.-]+)/i                           // Nero Home/Nero Scout
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(nokia\d+)\/((\d+)[\w\.-]+)/i                                      // Nokia
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /\s(songbird)\/((\d+)[\w\.-]+)/i                                    // Songbird/Philips-Songbird
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(winamp)3 version ((\d+)[\w\.-]+)/i,                               // Winamp
            /(winamp)\s((\d+)[\w\.-]+)/i,
            /(winamp)mpeg\/((\d+)[\w\.-]+)/i
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(ocms-bot|tapinradio|tunein radio|unknown|winamp|inlight radio)/i  // OCMS-bot/tap in radio/tunein/unknown/winamp (no other info)
                                                                                // inlight radio
@@ -384,32 +395,32 @@
            /(quicktime|rma|radioapp|radioclientapplication|soundtap|totem|stagefright|streamium)\/((\d+)[\w\.-]+)/i
                                                                                // QuickTime/RealMedia/RadioApp/RadioClientApplication/
                                                                                // SoundTap/Totem/Stagefright/Streamium
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(smp)((\d+)[\d\.]+)/i                                              // SMP
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(vlc) media player - version ((\d+)[\w\.]+)/i,                     // VLC Videolan
            /(vlc)\/((\d+)[\w\.-]+)/i,
            /(xbmc|gvfs|xine|xmms|irapp)\/((\d+)[\w\.-]+)/i,                    // XBMC/gvfs/Xine/XMMS/irapp
            /(foobar2000)\/((\d+)[\d\.]+)/i,                                    // Foobar2000
            /(itunes)\/((\d+)[\d\.]+)/i                                         // iTunes
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(wmplayer)\/((\d+)[\w\.-]+)/i,                                     // Windows Media Player
            /(windows-media-player)\/((\d+)[\w\.-]+)/i
-            ], [[NAME, /-/g, ' '], VERSION, MAJOR], [
+            ], [[NAME, /-/g, ' '], VERSION], [

            /windows\/((\d+)[\w\.-]+) upnp\/[\d\.]+ dlnadoc\/[\d\.]+ (home media server)/i
                                                                                // Windows Media Server
-            ], [VERSION, MAJOR, [NAME, 'Windows']], [
+            ], [VERSION, [NAME, 'Windows']], [

            /(com\.riseupradioalarm)\/((\d+)[\d\.]*)/i                          // RiseUP Radio Alarm
-            ], [NAME, VERSION, MAJOR], [
+            ], [NAME, VERSION], [

            /(rad.io)\s((\d+)[\d\.]+)/i,                                        // Rad.io
            /(radio.(?:de|at|fr))\s((\d+)[\d\.]+)/i
-            ], [[NAME, 'rad.io'], VERSION, MAJOR]
+            ], [[NAME, 'rad.io'], VERSION]

            //////////////////////
            // Media players END
@@ -483,8 +494,11 @@
            /android.+(transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+|nexus 7)/i
            ], [MODEL, [VENDOR, 'Asus'], [TYPE, TABLET]], [

-            /(sony)\s(tablet\s[ps])/i                                           // Sony Tablets
-            ], [VENDOR, MODEL, [TYPE, TABLET]], [
+            /(sony)\s(tablet\s[ps])\sbuild\//i,                                  // Sony
+            /(sony)?(?:sgp.+)\sbuild\//i
+            ], [[VENDOR, 'Sony'], [MODEL, 'Xperia Tablet'], [TYPE, TABLET]], [
+            /(?:sony)?(?:(?:(?:c|d)\d{4})|(?:so[-l].+))\sbuild\//i
+            ], [[VENDOR, 'Sony'], [MODEL, 'Xperia Phone'], [TYPE, MOBILE]], [

            /\s(ouya)\s/i,                                                      // Ouya
            /(nintendo)\s([wids3u]+)/i                                          // Nintendo
@@ -508,15 +522,19 @@
                                                                                // Alcatel/GeeksPhone/Huawei/Lenovo/Nexian/Panasonic/Sony
            ], [VENDOR, [MODEL, /_/g, ' '], [TYPE, MOBILE]], [
                
+            /(nexus\s9)/i                                                       // HTC Nexus 9
+            ], [MODEL, [VENDOR, 'HTC'], [TYPE, TABLET]], [
+
            /[\s\(;](xbox(?:\sone)?)[\s\);]/i                                   // Microsoft Xbox
            ], [MODEL, [VENDOR, 'Microsoft'], [TYPE, CONSOLE]], [
            /(kin\.[onetw]{3})/i                                                // Microsoft Kin
            ], [[MODEL, /\./g, ' '], [VENDOR, 'Microsoft'], [TYPE, MOBILE]], [

                                                                                // Motorola
-            /\s((milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?(:?\s4g)?))[\w\s]+build\//i,
-            /(mot)[\s-]?(\w+)*/i
-            ], [[VENDOR, 'Motorola'], MODEL, [TYPE, MOBILE]], [
+            /\s(milestone|droid(?:[2-4x]|\s(?:bionic|x2|pro|razr))?(:?\s4g)?)[\w\s]+build\//i,
+            /mot[\s-]?(\w+)*/i,
+            /(XT\d{3,4}) build\//i
+            ], [MODEL, [VENDOR, 'Motorola'], [TYPE, MOBILE]], [
            /android.+\s(mz60\d|xoom[\s2]{0,2})\sbuild\//i
            ], [MODEL, [VENDOR, 'Motorola'], [TYPE, TABLET]], [

@@ -529,6 +547,7 @@
            ], [[VENDOR, 'Samsung'], MODEL, [TYPE, MOBILE]], [
            /(samsung);smarttv/i
            ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
+
            /\(dtv[\);].+(aquos)/i                                              // Sharp
            ], [MODEL, [VENDOR, 'Sharp'], [TYPE, SMARTTV]], [
            /sie-(\w+)*/i                                                       // Siemens
@@ -538,10 +557,10 @@
            /(nokia)[\s_-]?([\w-]+)*/i
            ], [[VENDOR, 'Nokia'], MODEL, [TYPE, MOBILE]], [

-            /android\s3\.[\s\w-;]{10}(a\d{3})/i                                 // Acer
+            /android\s3\.[\s\w;-]{10}(a\d{3})/i                                 // Acer
            ], [MODEL, [VENDOR, 'Acer'], [TYPE, TABLET]], [

-            /android\s3\.[\s\w-;]{10}(lg?)-([06cv9]{3,4})/i                     // LG Tablet
+            /android\s3\.[\s\w;-]{10}(lg?)-([06cv9]{3,4})/i                     // LG Tablet
            ], [[VENDOR, 'LG'], MODEL, [TYPE, TABLET]], [
            /(lg) netcast\.tv/i                                                 // LG SmartTV
            ], [VENDOR, MODEL, [TYPE, SMARTTV]], [
@@ -561,8 +580,75 @@
            /android.+;\s(glass)\s\d/i                                          // Google Glass
            ], [MODEL, [VENDOR, 'Google'], [TYPE, WEARABLE]], [

+            /android.+(\w+)\s+build\/hm\1/i,                                        // Xiaomi Hongmi 'numeric' models
+            /android.+(hm[\s\-_]*note?[\s_]*(?:\d\w)?)\s+build/i,                   // Xiaomi Hongmi
+            /android.+(mi[\s\-_]*(?:one|one[\s_]plus)?[\s_]*(?:\d\w)?)\s+build/i    // Xiaomi Mi
+            ], [[MODEL, /_/g, ' '], [VENDOR, 'Xiaomi'], [TYPE, MOBILE]], [
+
            /(mobile|tablet);.+rv\:.+gecko\//i                                  // Unidentifiable
            ], [[TYPE, util.lowerize], VENDOR, MODEL]
+
+            /*//////////////////////////
+            // TODO: move to string map
+            ////////////////////////////
+
+            /(C6603)/i                                                          // Sony Xperia Z C6603
+            ], [[MODEL, 'Xperia Z C6603'], [VENDOR, 'Sony'], [TYPE, MOBILE]], [
+            /(C6903)/i                                                          // Sony Xperia Z 1
+            ], [[MODEL, 'Xperia Z 1'], [VENDOR, 'Sony'], [TYPE, MOBILE]], [
+
+            /(SM-G900[F|H])/i                                                   // Samsung Galaxy S5
+            ], [[MODEL, 'Galaxy S5'], [VENDOR, 'Samsung'], [TYPE, MOBILE]], [
+            /(SM-G7102)/i                                                       // Samsung Galaxy Grand 2
+            ], [[MODEL, 'Galaxy Grand 2'], [VENDOR, 'Samsung'], [TYPE, MOBILE]], [
+            /(SM-G530H)/i                                                       // Samsung Galaxy Grand Prime
+            ], [[MODEL, 'Galaxy Grand Prime'], [VENDOR, 'Samsung'], [TYPE, MOBILE]], [
+            /(SM-G313HZ)/i                                                      // Samsung Galaxy V
+            ], [[MODEL, 'Galaxy V'], [VENDOR, 'Samsung'], [TYPE, MOBILE]], [
+            /(SM-T805)/i                                                        // Samsung Galaxy Tab S 10.5
+            ], [[MODEL, 'Galaxy Tab S 10.5'], [VENDOR, 'Samsung'], [TYPE, TABLET]], [
+            /(SM-G800F)/i                                                       // Samsung Galaxy S5 Mini
+            ], [[MODEL, 'Galaxy S5 Mini'], [VENDOR, 'Samsung'], [TYPE, MOBILE]], [
+            /(SM-T311)/i                                                        // Samsung Galaxy Tab 3 8.0
+            ], [[MODEL, 'Galaxy Tab 3 8.0'], [VENDOR, 'Samsung'], [TYPE, TABLET]], [
+
+            /(R1001)/i                                                          // Oppo R1001
+            ], [MODEL, [VENDOR, 'OPPO'], [TYPE, MOBILE]], [
+            /(X9006)/i                                                          // Oppo Find 7a
+            ], [[MODEL, 'Find 7a'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
+            /(R2001)/i                                                          // Oppo YOYO R2001
+            ], [[MODEL, 'Yoyo R2001'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
+            /(R815)/i                                                           // Oppo Clover R815
+            ], [[MODEL, 'Clover R815'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
+             /(U707)/i                                                          // Oppo Find Way S
+            ], [[MODEL, 'Find Way S'], [VENDOR, 'Oppo'], [TYPE, MOBILE]], [
+
+            /(T3C)/i                                                            // Advan Vandroid T3C
+            ], [MODEL, [VENDOR, 'Advan'], [TYPE, TABLET]], [
+            /(ADVAN T1J\+)/i                                                    // Advan Vandroid T1J+
+            ], [[MODEL, 'Vandroid T1J+'], [VENDOR, 'Advan'], [TYPE, TABLET]], [
+            /(ADVAN S4A)/i                                                      // Advan Vandroid S4A
+            ], [[MODEL, 'Vandroid S4A'], [VENDOR, 'Advan'], [TYPE, MOBILE]], [
+
+            /(V972M)/i                                                          // ZTE V972M
+            ], [MODEL, [VENDOR, 'ZTE'], [TYPE, MOBILE]], [
+
+            /(i-mobile)\s(IQ\s[\d\.]+)/i                                        // i-mobile IQ
+            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
+            /(IQ6.3)/i                                                          // i-mobile IQ IQ 6.3
+            ], [[MODEL, 'IQ 6.3'], [VENDOR, 'i-mobile'], [TYPE, MOBILE]], [
+            /(i-mobile)\s(i-style\s[\d\.]+)/i                                   // i-mobile i-STYLE
+            ], [VENDOR, MODEL, [TYPE, MOBILE]], [
+            /(i-STYLE2.1)/i                                                     // i-mobile i-STYLE 2.1
+            ], [[MODEL, 'i-STYLE 2.1'], [VENDOR, 'i-mobile'], [TYPE, MOBILE]], [
+            
+            /(mobiistar touch LAI 512)/i                                        // mobiistar touch LAI 512
+            ], [[MODEL, 'Touch LAI 512'], [VENDOR, 'mobiistar'], [TYPE, MOBILE]], [
+
+            /////////////
+            // END TODO
+            ///////////*/
+
        ],

        engine : [[
@@ -662,7 +748,9 @@
        var rgxmap = extensions ? util.extend(regexes, extensions) : regexes;

        this.getBrowser = function () {
-            return mapper.rgx.apply(this, rgxmap.browser);
+            var browser = mapper.rgx.apply(this, rgxmap.browser);
+            browser.major = util.major(browser.version);
+            return browser;
        };
        this.getCPU = function () {
            return mapper.rgx.apply(this, rgxmap.cpu);
@@ -694,12 +782,13 @@
            return this;
        };
        this.setUA(ua);
+        return this;
    };

    UAParser.VERSION = LIBVERSION;
    UAParser.BROWSER = {
        NAME    : NAME,
-        MAJOR   : MAJOR,
+        MAJOR   : MAJOR, // deprecated
        VERSION : VERSION
    };
    UAParser.CPU = {
@@ -734,35 +823,41 @@
    // check js environment
    if (typeof(exports) !== UNDEF_TYPE) {
        // nodejs env
-        if (typeof(module) !== UNDEF_TYPE && module.exports) {
+        if (typeof module !== UNDEF_TYPE && module.exports) {
            exports = module.exports = UAParser;
        }
        exports.UAParser = UAParser;
    } else {
-        // browser env
-        window.UAParser = UAParser;
        // requirejs env (optional)
        if (typeof(define) === FUNC_TYPE && define.amd) {
            define(function () {
                return UAParser;
            });
-        }
-        // jQuery/Zepto specific (optional)
-        var $ = window.jQuery || window.Zepto;
-        if (typeof($) !== UNDEF_TYPE) {
-            var parser = new UAParser();
-            $.ua = parser.getResult();
-            $.ua.get = function() {
-                return parser.getUA();
-            };
-            $.ua.set = function (uastring) {
-                parser.setUA(uastring);
-                var result = parser.getResult();
-                for (var prop in result) {
-                    $.ua[prop] = result[prop];
-                }
-            };
+        } else {
+            // browser env
+            window.UAParser = UAParser;
        }
    }

+    // jQuery/Zepto specific (optional)
+    // Note: 
+    //   In AMD env the global scope should be kept clean, but jQuery is an exception.
+    //   jQuery always exports to global scope, unless jQuery.noConflict(true) is used,
+    //   and we should catch that.
+    var $ = window.jQuery || window.Zepto;
+    if (typeof $ !== UNDEF_TYPE) {
+        var parser = new UAParser();
+        $.ua = parser.getResult();
+        $.ua.get = function() {
+            return parser.getUA();
+        };
+        $.ua.set = function (uastring) {
+            parser.setUA(uastring);
+            var result = parser.getResult();
+            for (var prop in result) {
+                $.ua[prop] = result[prop];
+            }
+        };
+    }
+
 })(this);
--- a/test/browser-test.json
+++ b/test/browser-test.json
@@ -1,4 +1,24 @@
 [
+    {
+        "desc"    : "Android Browser on HTC Flyer (P510E)",
+        "ua"      : "Mozilla/5.0 (Linux; U; Android 3.2.1; ru-ru; HTC Flyer P510e Build/HTK75C) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13",
+        "expect"  : 
+        {
+            "name"    : "Android Browser",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
+    {
+        "desc"    : "Android Browser on Huawei Honor Glory II (U9508)",
+        "ua"      : "Mozilla/5.0 (Linux; U; Android 4.0.4; ru-by; HUAWEI U9508 Build/HuaweiU9508) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 ACHEETAHI/2100050044",
+        "expect"  : 
+        {
+            "name"    : "Android Browser",
+            "version" : "4.0",
+            "major"   : "4"
+        }
+    },
    {
        "desc"    : "Arora",
        "ua"      : "Mozilla/5.0 (Windows; U; Windows NT 5.1; de-CH) AppleWebKit/523.15 (KHTML, like Gecko, Safari/419.3) Arora/0.2",
@@ -349,6 +369,16 @@
            "major"   : "0"
        }
    },
+    {
+        "desc"    : "MIUI Browser on Xiaomi Hongmi WCDMA (HM2013023)",
+        "ua"      : "Mozilla/5.0 (Linux; U; Android 4.2.2; ru-ru; 2013023 Build/HM2013023) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 XiaoMi/MiuiBrowser/1.0",
+        "expect"  : 
+        {
+            "name"    : "MIUI Browser",
+            "version" : "1.0",
+            "major"   : "1"
+        }
+    },
    {
        "desc"    : "Mobile Safari",
        "ua"      : "Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_0 like Mac OS X; en-us) AppleWebKit/532.9 (KHTML, like Gecko) Version/4.0.5 Mobile/8A293 Safari/6531.22.7",
@@ -639,6 +669,16 @@
            "major"   : "8"
        }
    },
+    {
+        "desc"    : "Vivaldi",
+        "ua"      : "Mozilla/5.0 (Windows NT 6.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/40.0.2214.89 Vivaldi/1.0.83.38 Safari/537.36",
+        "expect"  : 
+        {
+            "name"    : "Vivaldi",
+            "version" : "1.0.83.38",
+            "major"   : "1"
+        }
+    },
    {
        "desc"    : "Yandex",
        "ua"      : "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_2) AppleWebKit/536.5 (KHTML, like Gecko) YaBrowser/1.0.1084.5402 Chrome/19.0.1084.5402 Safari/536.5",
@@ -648,5 +688,15 @@
            "version" : "1.0.1084.5402",
            "major"   : "1"
        }
+    },
+    {
+        "desc"    : "Windows 10 EI",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
+        "expect"  : 
+        {
+            "name"    : "IE",
+            "version" : "12.0",
+            "major"   : "12"
+        }
    }
 ]
--- a/test/device-test.json
+++ b/test/device-test.json
@@ -9,6 +9,16 @@
            "type"    : "mobile"
        }
    },
+    {
+        "desc"    : "HTC Nexus 9",
+        "ua"      : "Mozilla/5.0 (Linux; Android 5.0; Nexus 9 Build/LRX21R) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.143 Mobile Crosswalk/7.36.154.13 Safari/537.36",
+        "expect"  :
+        {
+            "vendor"  : "HTC",
+            "model"   : "Nexus 9",
+            "type"    : "tablet"
+        }
+    },
    {
        "desc"    : "LG Nexus 4",
        "ua"      : "Mozilla/5.0 (Linux; Android 4.2.1; Nexus 4 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Mobile Safari/535.19",
@@ -59,6 +69,16 @@
            "type"    : "mobile"
        }
    },
+    {
+        "desc"    : "Moto X",
+        "ua"      : "Mozilla/5.0 (Linux; U; Android 4.2; xx-xx; XT1058 Build/13.9.0Q2.X-70-GHOST-ATT_LE-2) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+        "expect"  :
+        {
+            "vendor"  : "Motorola",
+            "model"   : "XT1058",
+            "type"    : "mobile"
+        }
+    },
    {
        "desc"    : "Nokia3xx",
        "ua"      : "Nokia303/14.87 CLDC-1.1",
@@ -108,5 +128,115 @@
            "model"   : "SM-T520",
            "type"    : "tablet"
        }
+    },
+    {
+        "desc"    : "Sony C5303 (Xperia SP)",
+        "ua"      : "Mozilla/5.0 (Linux; Android 4.3; C5303 Build/12.1.A.1.205) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.93 Mobile Safari/537.36",
+        "expect"  :
+        {
+            "vendor"  : "Sony",
+            "model"   : "Xperia Phone",
+            "type"    : "mobile"
+        }
+    },
+    {
+        "desc"      : "Sony SO-02F (Xperia Z1 F)",
+        "ua"        : "Mozilla/5.0 (Linux; Android 4.2.2; SO-02F Build/14.1.H.2.119) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/34.0.1847.114 Mobile Safari/537.36",
+        "expect"    :
+        {
+            "vendor"  : "Sony",
+            "model"   : "Xperia Phone",
+            "type"    : "mobile"
+        }
+    },
+    {
+        "desc"      : "Sony D6653 (Xperia Z3)",
+        "ua"        : "Mozilla/5.0 (Linux; Android 4.4; D6653 Build/23.0.A.0.376) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/35.0.1916.141 Mobile Safari/537.36",
+        "expect"    :
+        {
+            "vendor"  : "Sony",
+            "model"   : "Xperia Phone",
+            "type"    : "mobile"
+        }
+    },
+    {
+        "desc"      : "Sony Xperia SOL25 (ZL2)",
+        "ua"        : "Mozilla/5.0 (Linux; U; Android 4.4; SOL25 Build/17.1.1.C.1.64) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+        "expect"    :
+        {
+            "vendor"  : "Sony",
+            "model"   : "Xperia Phone",
+            "type"    : "mobile"
+        }
+    },
+    {
+        "desc"      : "Sony SGP521 (Xperia Z2 Tablet)",
+        "ua"        : "Mozilla/5.0 (Linux; Android 4.4; SGP521 Build/17.1.A.0.432) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.99 Safari/537.36",
+        "expect"    :
+        {
+            "vendor"  : "Sony",
+            "model"   : "Xperia Tablet",
+            "type"    : "tablet"
+        }
+    },
+    {
+        "desc"      : "Sony Tablet S",
+        "ua"        : "Mozilla/5.0 (Linux; U; Android 3.1; Sony Tablet S Build/THMAS10000) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13",
+        "expect"    :
+        {
+            "vendor"  : "Sony",
+            "model"   : "Xperia Tablet",
+            "type"    : "tablet"
+        }
+    },
+    {
+        "desc"      : "Sony Tablet Z LTE",
+        "ua"        : "Mozilla/5.0 (Linux; U; Android 4.1; SonySGP321 Build/10.2.C.0.143) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30",
+        "expect"    :
+        {
+            "vendor"  : "Sony",
+            "model"   : "Xperia Tablet",
+            "type"    : "tablet"
+        }
+    },
+    {
+        "desc"      : "Xiaomi 2013023",
+        "ua"        : "Mozilla/5.0 (Linux; U; Android 4.2.2; en-US; 2013023 Build/HM2013023) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/10.0.1.512 U3/0.8.0 Mobile Safari/533.1",
+        "expect"    :
+        {
+            "vendor"  : "Xiaomi",
+            "model"   : "2013023",
+            "type"    : "mobile"
+        }
+    },
+    {
+        "desc"      : "Xiaomi Hongmi Note 1W",
+        "ua"        : "Mozilla/5.0 (Linux; U; Android 4.2.2; zh-CN; HM NOTE 1W Build/JDQ39) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.7.9.439 U3/0.8.0 Mobile Safari/533.1",
+        "expect"    :
+        {
+            "vendor"  : "Xiaomi",
+            "model"   : "HM NOTE 1W",
+            "type"    : "mobile"
+        }
+    },
+    {
+        "desc"      : "Xiaomi Mi 3C",
+        "ua"        : "Mozilla/5.0 (Linux; U; Android 4.3; zh-CN; MI 3C Build/JLS36C) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.7.9.439 U3/0.8.0 Mobile Safari/533.1",
+        "expect"    :
+        {
+            "vendor"  : "Xiaomi",
+            "model"   : "MI 3C",
+            "type"    : "mobile"
+        }
+    },
+    {
+        "desc"      : "Xiaomi Mi One Plus",
+        "ua"        : "Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; MI-ONE Plus Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30",
+        "expect"    :
+        {
+            "vendor"  : "Xiaomi",
+            "model"   : "MI-ONE Plus",
+            "type"    : "mobile"
+        }
    }
 ]
--- a/test/os-test.json
+++ b/test/os-test.json
@@ -71,6 +71,15 @@
            "version" : "8"
        }
    },
+    {
+        "desc"    : "Windows 10",
+        "ua"      : "Mozilla/5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/39.0.2171.71 Safari/537.36 Edge/12.0",
+        "expect"  :
+        {
+            "name"    : "Windows",
+            "version" : "10"
+        }
+    },
    {
        "desc"    : "Windows RT",
        "ua"      : "Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0)",
--- a/ua-parser-js.jquery.json
+++ b/ua-parser-js.jquery.json
@@ -1,32 +1,32 @@
 {
-    "title": "UAParser.js",
-    "name": "ua-parser-js",
-    "version": "0.7.3",
-    "description": "Lightweight JavaScript-based user-agent string parser",
-    "keywords": [
-        "user-agent",
-        "parser",
-        "browser",
-        "engine",
-        "os",
-        "device",
-        "cpu"
-    ],
-    "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/dist/ua-parser.min.js"
+  "title": "UAParser.js",
+  "name": "ua-parser-js",
+  "version": "0.7.7",
+  "description": "Lightweight JavaScript-based user-agent string parser",
+  "keywords": [
+    "user-agent",
+    "parser",
+    "browser",
+    "engine",
+    "os",
+    "device",
+    "cpu"
+  ],
+  "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/dist/ua-parser.min.js"
 }
Author	SHA1	Message	Date
Faisal Salman	1fa7137f1f	Fix #111	2015-04-29 11:29:54 +07:00
Faisal Salman	378a298fee	Merge pull request #110 from duzun/master Added a script to bump version in project files. Fix #107	2015-04-28 13:39:17 +07:00
Dumitru Uzun	32db7bfb97	verup adds \n at the end of JSON files	2015-04-20 14:24:20 +03:00
Dumitru Uzun	d1a18c6ff1	Added script to bump version. Eg: npm run verup -- 1.0	2015-04-20 14:19:37 +03:00
Faisal Salman	4887793ee0	Merge pull request #108 from mollases/master Adding Windows 10 IE 12 to ua-parser (w/ test)	2015-04-19 13:56:17 +07:00
Faisal Salman	b616d0b3d1	Merge pull request #106 from duzun/master updated email of Dumitru Uzun in package.json	2015-04-19 13:56:09 +07:00
Admas	c7749b3a2a	Adding WIndows 10 IE regex IE 12 for windows 10 uses gets caught as chrome: https://msdn.microsoft.com/en-us/library/ie/hh869301%28v=vs.85%29.aspx Now we search for Edge and mark it as IE	2015-04-17 09:23:28 -07:00
Admas	b00b2a7bcf	Adding WIndows 10 IE test	2015-04-17 09:21:11 -07:00
Dumitru Uzun	ca4e8ce2e6	update email of Dumitru Uzun; merged from faisalman	2015-04-17 17:33:30 +03:00
Faisal Salman	3d2d8d5d84	Fix jshint eror	2015-04-15 01:39:21 +07:00
Faisal Salman	cce9dc1474	Add meteor support	2015-04-07 02:40:50 +07:00
Faisal Salman	fa6f8de25f	Increment patch version to 0.7.4	2015-04-07 01:41:46 +07:00
Faisal Salman	6a284e2670	Temporarily comment device models to be moved soon	2015-04-07 01:37:14 +07:00
Faisal Salman	ad2613d8e9	Create package.js for meteor package	2015-04-07 01:19:14 +07:00
Faisal Salman	866bdc27af	Windows 10 test	2015-03-29 10:02:39 +07:00
Faisal Salman	a5cb2d8821	Fix #100 : Detect NT 10.0 as Windows 10	2015-03-29 09:57:34 +07:00
Faisal Salman	fe133e4228	Merge pull request #102 from demis-palma/patch-3 Unneeded comma	2015-03-10 22:48:42 +07:00
Faisal Salman	357ea1b42f	Merge pull request #101 from demis-palma/patch-1 Character class may not be used inside character range	2015-03-10 22:47:34 +07:00
Demis Palma	89a3a21ce3	Unneeded comma Removed last comma in array literal	2015-02-27 17:57:27 +00:00
Demis Palma	3c911f2dd4	Character class may not be used inside character range Additional information and examples at http://stackoverflow.com/questions/15321938/regex-character-class-inside-character-range-failing-intellijs-jslint-inspectio	2015-02-27 17:42:20 +00:00
Faisal Salman	69c688810d	Merge from @algenon	2015-02-27 11:55:52 +07:00
Faisal Salman	6b2571eaa3	Merge pull request #94 from d1o/develop Added Xperia Z, Galaxy, Oppo, Advan, i-mobile	2015-02-27 10:43:57 +07:00
otakuSiD	5dcc4db665	Get rid of duplicate Xiaomi detection	2015-02-26 15:19:09 +02:00
Dmitry Tyschenko	af9fc69161	Added Facebook application browser	2015-02-05 12:31:47 +02:00
Anton Zhiyanov	feed5498eb	Refactor Xiaomi regexps	2015-02-02 19:54:46 +03:00
Anton Zhiyanov	2e87b02dda	Add Vivaldi browser	2015-02-02 19:53:29 +03:00
Dmitry Tyschenko	f6b22d6654	Added Xperia Z, Galaxy, Oppo, Advan, i-mobile	2015-01-30 11:17:01 +02:00
Faisal Salman	354d29c2b6	Merge pull request #93 from austinpray/master fixes typeof	2015-01-29 13:05:51 +07:00
Faisal Salman	6402ac67b9	Merge pull request #91 from algenon/develop Android Browser and Xiaomi devices detection	2015-01-29 13:05:36 +07:00
Austin Pray	7cae802f3c	fixes typeof	2015-01-28 13:01:03 -06:00
algenon	5c25229616	Add Android and MIUI Browser to description	2015-01-25 18:26:43 +03:00
algenon	9d383c5395	Add Xiaomi devices	2015-01-25 17:54:39 +03:00
algenon	1eeb1face1	Add Android Browser and Xiaomi MIUI Browser	2015-01-25 17:39:15 +03:00
Faisal Salman	c3ddbe27ae	Merge pull request #88 from soundrop/develop Better detection of Sony Xperia devices	2015-01-10 18:53:46 +07:00
Dumitru Uzun	073b551b90	Merge branch 'master' of https://github.com/faisalman/ua-parser-js	2014-12-27 00:32:02 +02:00
Sylvain Gizard	7d5e50f008	Remove duplication	2014-12-18 16:26:38 +01:00
Sylvain Gizard	294fae589d	Remove duplicated test	2014-12-18 16:09:51 +01:00
Sylvain Gizard	d47e1a5e8e	Update build	2014-12-18 16:04:31 +01:00
Sylvain Gizard	50c4e3e551	Trailing whitespace	2014-12-18 16:04:24 +01:00
Sylvain Gizard	5002ea0846	Rough detection of Sony Xperia phones and tablets	2014-12-18 16:04:08 +01:00
Faisal Salman	bc4561b1c1	Merge pull request #86 from sgautrea/nexus-9 Adding HTC Nexus 9 recognition	2014-12-03 15:30:16 +07:00
Shane Gautreau	083db7b7d2	Adding test for Nexus 9 recognition	2014-12-02 16:46:04 -05:00
sgautrea	744c9bf0bd	Update ua-parser.js Adding regex for Nexus 9 tablet	2014-12-02 16:08:47 -05:00
Dumitru Uzun	27c17736c2	Closure Compiled	2014-11-20 12:41:15 +02:00
Faisal Salman	4d3656bb9c	Merge pull request #81 from duzun/patch-2 Keep global scope clean with AMD. Always check for jQuery global.	2014-11-20 17:40:52 +07:00
Dumitru Uzun	551fbf100c	Keep global scope clean with AMD. Always check for jQuery global. If an AMD environment, don't export `UAParser` to global scope. Even in AMD environment jQuery exports to global scope. We should catch it even then. It also can happen then one joins the jQuery source file with other jQuery plugins in a CommonJS env.	2014-11-20 12:32:31 +02:00
Faisal Salman	e725633328	Fix #24 #80	2014-11-20 07:15:18 +07:00
Faisal Salman	d5cf025713	Merge pull request #79 from hmvs/patch-3 Moto X, G, Razr Mobile detection	2014-11-20 07:07:26 +07:00
Vadim Kurachevsky	9256ed4186	Moto X, G, Razr Mobile detection Moto RAZR: Mozilla/5.0 (Linux; Android 4.0.4; XT910 Build/6.7.2-180_SPU-19-TA-11.6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/36.0.1985.135 Mobile Safari/537.36 Moto X: Mozilla/5.0 (Linux; U; Android 4.2; xx-xx; XT1058 Build/13.9.0Q2.X-70-GHOST-ATT_LE-2) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 Moto G: Mozilla/5.0 (Linux; Android 4.4.2; XT1033 Build/KXB20.25-1.31) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/33.0.1750.136 Mobile Safari/537.36	2014-11-19 10:38:48 +02:00
Faisal Salman	70d629ca71	Extract major from version instead of directly using regex	2014-11-10 18:43:04 +07:00