ua-parser-js - npm Package Compare versions

Comparing version 0.4.1 to 0.4.3

package.json

 {
   "title": "UA-Parser.JS",
   "name": "ua-parser-js",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "author": "Faisal Salman <[e-mail]> (http://faisalman.com)",
@@ -6,0 +6,0 @@ "description": "Lightweight JavaScript-based user-agent string parser",

readme.md

@@ -51,4 +51,5 @@ # UA-Parser.JS
             device: {
-                name: "",
-                version: ""
+                model: "",
+                type: "",
+                vendor: ""
             }
@@ -63,2 +64,3 @@ }
     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"}
@@ -70,2 +72,3 @@ console.log(parser.getResult().os);         // {name: "Ubuntu", version: "11.10"}
     console.log(parser.getOS());                // {name: "OpenBSD", version: undefined}
+    console.log(parser.getEngine());            // {name: "KHTML", version: "4.1.4"}
 </script>
@@ -81,3 +84,3 @@ ```
 
-console.log(parser.setUA(uaString).getDevice().name);   // "PlayBook"
+console.log(parser.setUA(uaString).getDevice().model);  // "PlayBook"
 console.log(parser.getOS())                             // {name: "RIM Tablet OS", version: "1.0.0"}
@@ -84,0 +87,0 @@ console.log(parser.getEngine().name);                   // "AppleWebKit"

ua-parser.js

@@ -1,2 +0,2 @@
-// UA-Parser.JS v0.4.1
+// UA-Parser.JS v0.4.3
 // Lightweight JavaScript-based User-Agent string parser
@@ -11,3 +11,3 @@ // https://github.com/faisalman/ua-parser-js
     'use strict';
-
+    
     var mapper = {
@@ -107,2 +107,8 @@
 
+            // Presto based
+            /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
+            /(opera\smobi)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mobile
+            /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera > 9.80
+            /(opera)[\/\s]+((\d+)?[\w\.]+)/i,                                   // Opera < 9.80
+            
             // Mixed
@@ -113,8 +119,2 @@ /(kindle)\/((\d+)?[\w\.]+)/i,                                       // Kindle
             
-            // Presto based
-            /(opera\smini)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mini
-            /(opera\smobi)\/((\d+)?[\w\.-]+)/i,                                 // Opera Mobile
-            /(opera).+version\/((\d+)?[\w\.]+)/i,                               // Opera
-            /(opera)[\/\s]+((\d+)?[\w\.]+)/i,
-            
             // Trident based
@@ -150,35 +150,56 @@ /(avant\sbrowser|iemobile|slimbrowser)[\/\s]?((\d+)?[\w\.]*)/i,     // Avant/IEMobile/SlimBrowser
 
-            /\((ip[honead]+|playbook);/i,                                       // iPod/iPhone/iPad/PlayBook
+            /\(((ipad|playbook));/i,                                            // iPad/PlayBook
+            /(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']], [
+
+            /\(((ip[honed]+));/i,                                               // iPod/iPhone
             /(blackberry)[\s-]?(\w+)/i,                                         // BlackBerry
-            /(blackberry|benq|palm(?=\-)|sonyericsson|acer|asus|dell|nexus|zte|huawei)[\s_-]?([\w-]+)*/i,  
-                                                                                // BenQ/Palm/Sony-Ericsson/Acer/Asus/Dell/Nexus/ZTE/Huawei
+            /(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
-            /(hp).+(touchpad)/i,                                                // HP TouchPad
-            /(kindle)\/([\w\.]+)/i,                                             // Kindle
-            /(lg)[e;\s-]+(\w+)*/i,                                              // LG
-            /(nintendo|playstation)\s([wids3portable]+)/i                       // Nintendo/Playstation
-            ], ['name', 'version'], [
+            /(asus)-?(\w+)/i                                                    // Asus
+            ], ['vendor', 'model', ['type', 'Mobile']], [
             
-            /(htc)[;_\s-]+([\w\s]+(?=\))|[\w]+)*/i,                             // HTC
-            /(zte)-([\w]+)*/i
-            ], ['name', ['version', /_/g, ' ']], [
+            /android.+((transfo[prime\s]{4,10}\s\w+|eeepc|slider\s\w+))/i       // Asus Tablets
+            ], [['vendor', 'Asus'], 'model', ['type', 'Tablet']], [
+            
+            /(sony)\s(tablet\s[ps])/i                                           // Sony Tablets
+            ], ['vendor', 'model', ['type', 'Tablet']], [
+            
+            /(nintendo|playstation)\s([wids3portablev]+)/i                      // Nintendo/Playstation
+            ], ['vendor', 'model', ['type', 'Console']], [
+            
+            /(htc)[;_\s-]+([\w\s]+(?=\))|\w+)*/i,                               // HTC
+            /(zte)-(\w+)*/i                                                     // ZTE
+            ], ['vendor', ['model', /_/g, ' '], ['type', 'Mobile']], [
                         
-            /\s((milestone|mz601|droid[2x]?|xoom))[globa\s]*\sbuild\//i,        // Motorola
+            /\s((milestone|droid[2x]?))[globa\s]*\sbuild\//i,                   // Motorola
             /(mot)[\s-]?(\w+)*/i
-            ], [['name', 'Motorola'], 'version'], [
+            ], [['vendor', 'Motorola'], 'model', ['type', 'Mobile']], [            
+            /android.+\s((mz60\d|xoom[\s2]{0,2}))\sbuild\//i
+            ], [['vendor', 'Motorola'], 'model', ['type', 'Tablet']], [
             
-            /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,                            // Samsung
+            /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
+            /((s[cgp]h-\w+|gt-\w+|galaxy\snexus))/i,
             /(sam[sung]*)[\s-]*(\w+-?[\w-]*)*/i,
             /sec-((sgh\w+))/i
-            ], [['name', 'Samsung'], 'version'], [
-            
-            /((transfo[prime\s]{4,10}\s\w+))|(?:android.*)((eeepc))/i           // Asus
-            ], [['name', 'Asus'], 'version'], [
-
+            ], [['vendor', 'Samsung'], 'model', ['type', 'Mobile']], [
             /(sie)-(\w+)*/i                                                     // Siemens
-            ], [['name', 'Siemens'], 'version'], [
+            ], [['vendor', 'Siemens'], 'model', ['type', 'Mobile']], [
             
             /(maemo|nokia).*(n900|lumia\s\d+)/i,                                // Nokia
             /(nokia)[\s_-]?([\w-]+)*/i
-            ], [['name', 'Nokia'], 'version']            
+            ], [['vendor', 'Nokia'], 'model', ['type', 'Mobile']], [
+            
+            /android\s3\.[\s\w-;]{10}((a\d{3}))/i                               // Acer
+            ], [['vendor', 'Acer'], 'model', ['type', 'Tablet']], [
+            
+            /android\s3\.[\s\w-;]{10}(lg?)-([06cv9]{3,4})/i                     // LG
+            ], [['vendor', 'LG'], 'model', ['type', 'Tablet']], [
+            /(lg)[e;\s-\/]+(\w+)*/i
+            ], [['vendor', 'LG'], 'model', ['type', 'Mobile']]
         ],
@@ -189,3 +210,3 @@
             /(presto)\/([\w\.]+)/i,                                             // Presto
-            /([aple]*webkit|trident)\/([\w\.]+)/i,                              // Webkit/Trident
+            /([aple]*webkit|trident|netfront)\/([\w\.]+)/i,                     // Webkit/Trident/NetFront
             /(khtml)\/([\w\.]+)/i                                               // KHTML
@@ -201,3 +222,3 @@ ], ['name', 'version'], [
             // Windows based
-            /(windows\sphone\sos|windows)\s?([ntce\d\.\s]+\d)/i                 // Windows
+            /(windows\sphone\sos|windows\s?[mobile]*)[\s\/]?([ntce\d\.\s]+\w)/i // Windows
             ], ['name', ['version', mapper.string, maps.os.windows.version]], [
@@ -210,4 +231,8 @@ /(win(?=3|9|n)|win\s9x\s)([nt\d\.]+)/i
             /(tizen)\/([\w\.]+)/i,                                              // Tizen
-            /(android|symbianos|symbos|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i,
-                                                                                // Android/Symbian/WebOS/Palm/QNX/Bada/RIM/MeeGo
+            /(android|webos|palm\os|qnx|bada|rim\stablet\sos|meego)[\/\s-]?([\w\.]+)*/i
+                                                                                // Android/WebOS/Palm/QNX/Bada/RIM/MeeGo
+            ], ['name', 'version'], [
+            /(symbian\s?os|symbos|s60(?=;))[\/\s-]?([\w\.]+)*/i                 // Symbian
+            ], [['name', 'Symbian'], 'version'],[
+            
             /(nintendo|playstation)\s([wids3portable]+)/i,                      // Nintendo/Playstation
@@ -223,3 +248,3 @@
 
-            /(cros)\s([\w\.\s]+\d)/i                                            // Chromium OS
+            /(cros)\s[\w]+\s([\w\.]+\w)/i                                       // Chromium OS
             ], [['name', 'Chromium OS'], 'version'],[
@@ -226,0 +251,0 @@

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

19312

increased by11.15%

Lines of code

257

increased by8.44%

Number of lines in readme file

99

increased by3.13%

No dependency changes