ng-device-detector - npm Package Compare versions

Comparing version 1.1.6 to 1.1.7

bower.json

 {
   "name": "ng-device-detector",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "homepage": "https://github.com/srfrnk/ng-device-detector",
@@ -5,0 +5,0 @@ "authors": [

ng-device-detector.js

@@ -17,8 +17,9 @@ (function (angular) {
             ANDROID: "android",
-            IPAD: "ipad",
+            I_PAD: "ipad",
             IPHONE: "iphone",
-            IPOD: "ipod",
+            I_POD: "ipod",
             BLACKBERRY: "blackberry",
-            FIREFOXOS: "firefoxos",
-            WINDOWSPHONE: "windows-phone",
+            FIREFOX_OS: "firefox-os",
+            CHROME_BOOK: "chrome-book",
+            WINDOWS_PHONE: "windows-phone",
             PS4: "ps4",
@@ -35,4 +36,5 @@ VITA: "vita",
             UNIX: "unix",
-            FIREFOXOS: "firefoxos",
-            WINDOWSPHONE: "windows-phone",
+            FIREFOX_OS: "firefox-os",
+            CHROME_OS: "chrome-os",
+            WINDOWS_PHONE: "windows-phone",
             PS4: "ps4",
@@ -74,3 +76,3 @@ VITA: "vita",
                 this.isIOS = function () {
-                    return (deviceInfo.os === OS.IOS || deviceInfo.device === DEVICES.IPOD || deviceInfo.device === DEVICES.IPHONE);
+                    return (deviceInfo.os === OS.IOS || deviceInfo.device === DEVICES.I_POD || deviceInfo.device === DEVICES.IPHONE);
                 };
@@ -89,4 +91,5 @@ }
                     UNIX: /\bUNIX\b/,
-                    FIREFOXOS: {and: [/\bFirefox\b/, /Mobile\b/]},
-                    WINDOWSPHONE: {or:[/\bIEMobile\b/,/\bWindows Phone\b/]},
+                    FIREFOX_OS: {and: [/\bFirefox\b/, /Mobile\b/]},
+                    CHROME_OS: /\bCrOS\b/,
+                    WINDOWS_PHONE: {or:[/\bIEMobile\b/,/\bWindows Phone\b/]},
                     PS4: /\bMozilla\/5.0 \(PlayStation 4\b/,
@@ -109,8 +112,9 @@ VITA: /\bMozilla\/5.0 \(Play(S|s)tation Vita\b/
                     ANDROID: {and:[/\bAndroid\b/,{not:/Windows Phone/}]},
-                    IPAD: /\biPad\b/,
+                    I_PAD: /\biPad\b/,
                     IPHONE: /\biPhone\b/,
-                    IPOD: /\biPod\b/,
+                    I_POD: /\biPod\b/,
                     BLACKBERRY: /\bblackberry\b/,
-                    FIREFOXOS: {and: [/\bFirefox\b/, /\bMobile\b/]},
-                    WINDOWSPHONE: {or:[/\bIEMobile\b/,/\bWindows Phone\b/]},
+                    FIREFOX_OS: {and: [/\bFirefox\b/, /\bMobile\b/]},
+                    CHROME_BOOK: /\bCrOS\b/,
+                    WINDOWS_PHONE: {or:[/\bIEMobile\b/,/\bWindows Phone\b/]},
                     PS4: /\bMozilla\/5.0 \(PlayStation 4\b/,
@@ -191,4 +195,5 @@ VITA: /\bMozilla\/5.0 \(Play(S|s)tation Vita\b/
                     OS.UNIX,
-                    OS.FIREFOXOS,
-                    OS.WINDOWSPHONE,
+                    OS.FIREFOX_OS,
+                    OS.CHROME_OS,
+                    OS.WINDOWS_PHONE,
                     OS.PS4,
@@ -215,8 +220,9 @@ OS.VITA
                     DEVICES.ANDROID,
-                    DEVICES.IPAD,
+                    DEVICES.I_PAD,
                     DEVICES.IPHONE,
-                    DEVICES.IPOD,
+                    DEVICES.I_POD,
                     DEVICES.BLACKBERRY,
-                    DEVICES.FIREFOXOS,
-                    DEVICES.WINDOWSPHONE,
+                    DEVICES.FIREFOX_OS,
+                    DEVICES.CHROME_BOOK,
+                    DEVICES.WINDOWS_PHONE,
                     DEVICES.PS4,
@@ -261,8 +267,9 @@ DEVICES.VITA
                         DEVICES.ANDROID,
-                        DEVICES.IPAD,
+                        DEVICES.I_PAD,
                         DEVICES.IPHONE,
-                        DEVICES.IPOD,
+                        DEVICES.I_POD,
                         DEVICES.BLACKBERRY,
-                        DEVICES.FIREFOXOS,
-                        DEVICES.WINDOWSPHONE,
+                        DEVICES.FIREFOX_OS,
+                        DEVICES.CHROME_BOOK,
+                        DEVICES.WINDOWS_PHONE,
                         DEVICES.VITA
@@ -276,4 +283,5 @@ ].some(function (item) {
                     return [
-                        DEVICES.IPAD,
-                        DEVICES.FIREFOXOS
+                        DEVICES.I_PAD,
+                        DEVICES.FIREFOX_OS,
+                        DEVICES.CHROME_BOOK
                     ].some(function (item) {
@@ -280,0 +288,0 @@ return deviceInfo.device == item;

ng-device-detector.min.js

@@ -1,1 +0,1 @@
-!function(n){"use strict";n.module("ng.deviceDetector",["reTree"]).constant("BROWSERS",{CHROME:"chrome",FIREFOX:"firefox",SAFARI:"safari",OPERA:"opera",IE:"ie",MS_EDGE:"ms-edge",PS4:"ps4",VITA:"vita",UNKNOWN:"unknown"}).constant("DEVICES",{ANDROID:"android",IPAD:"ipad",IPHONE:"iphone",IPOD:"ipod",BLACKBERRY:"blackberry",FIREFOXOS:"firefoxos",WINDOWSPHONE:"windows-phone",PS4:"ps4",VITA:"vita",UNKNOWN:"unknown"}).constant("OS",{WINDOWS:"windows",MAC:"mac",IOS:"ios",ANDROID:"android",LINUX:"linux",UNIX:"unix",FIREFOXOS:"firefoxos",WINDOWSPHONE:"windows-phone",PS4:"ps4",VITA:"vita",UNKNOWN:"unknown"}).constant("OS_VERSIONS",{WINDOWS_3_11:"windows-3-11",WINDOWS_95:"windows-95",WINDOWS_ME:"windows-me",WINDOWS_98:"windows-98",WINDOWS_CE:"windows-ce",WINDOWS_2000:"windows-2000",WINDOWS_XP:"windows-xp",WINDOWS_SERVER_2003:"windows-server-2003",WINDOWS_VISTA:"windows-vista",WINDOWS_7:"windows-7",WINDOWS_8_1:"windows-8-1",WINDOWS_8:"windows-8",WINDOWS_10:"windows-10",WINDOWS_PHONE_7_5:"windows-phone-7-5",WINDOWS_PHONE_10:"windows-phone-10",WINDOWS_NT_4_0:"windows-nt-4-0",UNKNOWN:"unknown"}).service("detectUtils",["deviceDetector","DEVICES","BROWSERS","OS",function(n,o,e,i){var W=n;this.isMobile=function(){return"unknown"!==W.device},this.isAndroid=function(){return W.device===o.ANDROID||W.OS===i.ANDROID},this.isIOS=function(){return W.os===i.IOS||W.device===o.IPOD||W.device===o.IPHONE}}]).factory("deviceDetector",["$window","DEVICES","BROWSERS","OS","OS_VERSIONS","reTree",function(n,o,e,i,W,O){var N={WINDOWS:{and:[{or:[/\bWindows|(Win\d\d)\b/,/\bWin 9x\b/]},{not:/\bWindows Phone\b/}]},MAC:/\bMac OS\b/,IOS:{or:[/\biPad\b/,/\biPhone\b/,/\biPod\b/]},ANDROID:{and:[/\bAndroid\b/,{not:/Windows Phone/}]},LINUX:/\bLinux\b/,UNIX:/\bUNIX\b/,FIREFOXOS:{and:[/\bFirefox\b/,/Mobile\b/]},WINDOWSPHONE:{or:[/\bIEMobile\b/,/\bWindows Phone\b/]},PS4:/\bMozilla\/5.0 \(PlayStation 4\b/,VITA:/\bMozilla\/5.0 \(Play(S|s)tation Vita\b/},r={CHROME:{and:[{or:[/\bChrome\b/,/\bCriOS\b/]},{not:{or:[/\bOPR\b/,/\bEdge\b/]}}]},FIREFOX:/\bFirefox\b/,SAFARI:{and:[/^((?!CriOS).)*\Safari\b.*$/,{not:{or:[/\bOPR\b/,/\bEdge\b/]}}]},OPERA:{or:[/Opera\b/,/\bOPR\b/]},IE:{or:[/\bMSIE\b/,/\bTrident\b/]},MS_EDGE:{or:[/\bEdge\b/]},PS4:/\bMozilla\/5.0 \(PlayStation 4\b/,VITA:/\bMozilla\/5.0 \(Play(S|s)tation Vita\b/},I={ANDROID:{and:[/\bAndroid\b/,{not:/Windows Phone/}]},IPAD:/\biPad\b/,IPHONE:/\biPhone\b/,IPOD:/\biPod\b/,BLACKBERRY:/\bblackberry\b/,FIREFOXOS:{and:[/\bFirefox\b/,/\bMobile\b/]},WINDOWSPHONE:{or:[/\bIEMobile\b/,/\bWindows Phone\b/]},PS4:/\bMozilla\/5.0 \(PlayStation 4\b/,VITA:/\bMozilla\/5.0 \(Play(S|s)tation Vita\b/},s={WINDOWS_3_11:/Win16/,WINDOWS_95:/(Windows 95|Win95|Windows_95)/,WINDOWS_ME:/(Win 9x 4.90|Windows ME)/,WINDOWS_98:/(Windows 98|Win98)/,WINDOWS_CE:/Windows CE/,WINDOWS_2000:/(Windows NT 5.0|Windows 2000)/,WINDOWS_XP:/(Windows NT 5.1|Windows XP)/,WINDOWS_SERVER_2003:/Windows NT 5.2/,WINDOWS_VISTA:/Windows NT 6.0/,WINDOWS_7:/(Windows 7|Windows NT 6.1)/,WINDOWS_8_1:/(Windows 8.1|Windows NT 6.3)/,WINDOWS_8:/(Windows 8|Windows NT 6.2)/,WINDOWS_10:/(Windows NT 10.0)/,WINDOWS_PHONE_7_5:/(Windows Phone OS 7.5)/,WINDOWS_PHONE_10:/(Windows Phone 10)/,WINDOWS_NT_4_0:{and:[/(Windows NT 4.0|WinNT4.0|WinNT|Windows NT)/,{not:/Windows NT 10.0/}]}},S={CHROME:/\bChrome\/([\d\.]+)\b/,FIREFOX:/\bFirefox\/([\d\.]+)\b/,SAFARI:/\bVersion\/([\d\.]+)\b/,OPERA:[/\bVersion\/([\d\.]+)\b/,/\bOPR\/([\d\.]+)\b/],IE:[/\bMSIE ([\d\.]+\w?)\b/,/\brv:([\d\.]+\w?)\b/],MS_EDGE:/\bEdge\/([\d\.]+)\b/},d=Object.keys(S).reduce(function(n,o){return n[e[o]]=S[o],n},{}),b=n.navigator.userAgent,t={raw:{userAgent:b,os:{},browser:{},device:{}}};if(t.raw.os=Object.keys(i).reduce(function(n,o){return n[i[o]]=O.test(b,N[o]),n},{}),t.raw.browser=Object.keys(e).reduce(function(n,o){return n[e[o]]=O.test(b,r[o]),n},{}),t.raw.device=Object.keys(o).reduce(function(n,e){return n[o[e]]=O.test(b,I[e]),n},{}),t.raw.os_version=Object.keys(W).reduce(function(n,o){return n[W[o]]=O.test(b,s[o]),n},{}),t.os=[i.WINDOWS,i.IOS,i.MAC,i.ANDROID,i.LINUX,i.UNIX,i.FIREFOXOS,i.WINDOWSPHONE,i.PS4,i.VITA].reduce(function(n,o){return n===i.UNKNOWN&&t.raw.os[o]?o:n},i.UNKNOWN),t.browser=[e.CHROME,e.FIREFOX,e.SAFARI,e.OPERA,e.IE,e.MS_EDGE,e.PS4,e.VITA].reduce(function(n,o){return n===e.UNKNOWN&&t.raw.browser[o]?o:n},e.UNKNOWN),t.device=[o.ANDROID,o.IPAD,o.IPHONE,o.IPOD,o.BLACKBERRY,o.FIREFOXOS,o.WINDOWSPHONE,o.PS4,o.VITA].reduce(function(n,e){return n===o.UNKNOWN&&t.raw.device[e]?e:n},o.UNKNOWN),t.os_version=[W.WINDOWS_3_11,W.WINDOWS_95,W.WINDOWS_ME,W.WINDOWS_98,W.WINDOWS_CE,W.WINDOWS_2000,W.WINDOWS_XP,W.WINDOWS_SERVER_2003,W.WINDOWS_VISTA,W.WINDOWS_7,W.WINDOWS_8_1,W.WINDOWS_8,W.WINDOWS_10,W.WINDOWS_PHONE_7_5,W.WINDOWS_PHONE_10,W.WINDOWS_NT_4_0].reduce(function(n,o){return n===W.UNKNOWN&&t.raw.os_version[o]?o:n},W.UNKNOWN),t.browser_version="0",t.browser!==e.UNKNOWN){var D=d[t.browser],w=O.exec(b,D);w&&(t.browser_version=w[1])}return t.isMobile=function(){return[o.ANDROID,o.IPAD,o.IPHONE,o.IPOD,o.BLACKBERRY,o.FIREFOXOS,o.WINDOWSPHONE,o.VITA].some(function(n){return t.device==n})},t.isTablet=function(){return[o.IPAD,o.FIREFOXOS].some(function(n){return t.device==n})},t.isDesktop=function(){return[o.PS4,o.UNKNOWN].some(function(n){return t.device==n})},t}]).directive("deviceDetector",["deviceDetector",function(n){return{restrict:"A",link:function(o,e){e.addClass("os-"+n.os),e.addClass("browser-"+n.browser),e.addClass("device-"+n.device)}}}])}(angular);
+!function(n){"use strict";n.module("ng.deviceDetector",["reTree"]).constant("BROWSERS",{CHROME:"chrome",FIREFOX:"firefox",SAFARI:"safari",OPERA:"opera",IE:"ie",MS_EDGE:"ms-edge",PS4:"ps4",VITA:"vita",UNKNOWN:"unknown"}).constant("DEVICES",{ANDROID:"android",I_PAD:"ipad",IPHONE:"iphone",I_POD:"ipod",BLACKBERRY:"blackberry",FIREFOX_OS:"firefox-os",CHROME_BOOK:"chrome-book",WINDOWS_PHONE:"windows-phone",PS4:"ps4",VITA:"vita",UNKNOWN:"unknown"}).constant("OS",{WINDOWS:"windows",MAC:"mac",IOS:"ios",ANDROID:"android",LINUX:"linux",UNIX:"unix",FIREFOX_OS:"firefox-os",CHROME_OS:"chrome-os",WINDOWS_PHONE:"windows-phone",PS4:"ps4",VITA:"vita",UNKNOWN:"unknown"}).constant("OS_VERSIONS",{WINDOWS_3_11:"windows-3-11",WINDOWS_95:"windows-95",WINDOWS_ME:"windows-me",WINDOWS_98:"windows-98",WINDOWS_CE:"windows-ce",WINDOWS_2000:"windows-2000",WINDOWS_XP:"windows-xp",WINDOWS_SERVER_2003:"windows-server-2003",WINDOWS_VISTA:"windows-vista",WINDOWS_7:"windows-7",WINDOWS_8_1:"windows-8-1",WINDOWS_8:"windows-8",WINDOWS_10:"windows-10",WINDOWS_PHONE_7_5:"windows-phone-7-5",WINDOWS_PHONE_10:"windows-phone-10",WINDOWS_NT_4_0:"windows-nt-4-0",UNKNOWN:"unknown"}).service("detectUtils",["deviceDetector","DEVICES","BROWSERS","OS",function(n,o,e,O){var i=n;this.isMobile=function(){return"unknown"!==i.device},this.isAndroid=function(){return i.device===o.ANDROID||i.OS===O.ANDROID},this.isIOS=function(){return i.os===O.IOS||i.device===o.I_POD||i.device===o.IPHONE}}]).factory("deviceDetector",["$window","DEVICES","BROWSERS","OS","OS_VERSIONS","reTree",function(n,o,e,O,i,W){var N={WINDOWS:{and:[{or:[/\bWindows|(Win\d\d)\b/,/\bWin 9x\b/]},{not:/\bWindows Phone\b/}]},MAC:/\bMac OS\b/,IOS:{or:[/\biPad\b/,/\biPhone\b/,/\biPod\b/]},ANDROID:{and:[/\bAndroid\b/,{not:/Windows Phone/}]},LINUX:/\bLinux\b/,UNIX:/\bUNIX\b/,FIREFOX_OS:{and:[/\bFirefox\b/,/Mobile\b/]},CHROME_OS:/\bCrOS\b/,WINDOWS_PHONE:{or:[/\bIEMobile\b/,/\bWindows Phone\b/]},PS4:/\bMozilla\/5.0 \(PlayStation 4\b/,VITA:/\bMozilla\/5.0 \(Play(S|s)tation Vita\b/},r={CHROME:{and:[{or:[/\bChrome\b/,/\bCriOS\b/]},{not:{or:[/\bOPR\b/,/\bEdge\b/]}}]},FIREFOX:/\bFirefox\b/,SAFARI:{and:[/^((?!CriOS).)*\Safari\b.*$/,{not:{or:[/\bOPR\b/,/\bEdge\b/]}}]},OPERA:{or:[/Opera\b/,/\bOPR\b/]},IE:{or:[/\bMSIE\b/,/\bTrident\b/]},MS_EDGE:{or:[/\bEdge\b/]},PS4:/\bMozilla\/5.0 \(PlayStation 4\b/,VITA:/\bMozilla\/5.0 \(Play(S|s)tation Vita\b/},I={ANDROID:{and:[/\bAndroid\b/,{not:/Windows Phone/}]},I_PAD:/\biPad\b/,IPHONE:/\biPhone\b/,I_POD:/\biPod\b/,BLACKBERRY:/\bblackberry\b/,FIREFOX_OS:{and:[/\bFirefox\b/,/\bMobile\b/]},CHROME_BOOK:/\bCrOS\b/,WINDOWS_PHONE:{or:[/\bIEMobile\b/,/\bWindows Phone\b/]},PS4:/\bMozilla\/5.0 \(PlayStation 4\b/,VITA:/\bMozilla\/5.0 \(Play(S|s)tation Vita\b/},S={WINDOWS_3_11:/Win16/,WINDOWS_95:/(Windows 95|Win95|Windows_95)/,WINDOWS_ME:/(Win 9x 4.90|Windows ME)/,WINDOWS_98:/(Windows 98|Win98)/,WINDOWS_CE:/Windows CE/,WINDOWS_2000:/(Windows NT 5.0|Windows 2000)/,WINDOWS_XP:/(Windows NT 5.1|Windows XP)/,WINDOWS_SERVER_2003:/Windows NT 5.2/,WINDOWS_VISTA:/Windows NT 6.0/,WINDOWS_7:/(Windows 7|Windows NT 6.1)/,WINDOWS_8_1:/(Windows 8.1|Windows NT 6.3)/,WINDOWS_8:/(Windows 8|Windows NT 6.2)/,WINDOWS_10:/(Windows NT 10.0)/,WINDOWS_PHONE_7_5:/(Windows Phone OS 7.5)/,WINDOWS_PHONE_10:/(Windows Phone 10)/,WINDOWS_NT_4_0:{and:[/(Windows NT 4.0|WinNT4.0|WinNT|Windows NT)/,{not:/Windows NT 10.0/}]}},b={CHROME:/\bChrome\/([\d\.]+)\b/,FIREFOX:/\bFirefox\/([\d\.]+)\b/,SAFARI:/\bVersion\/([\d\.]+)\b/,OPERA:[/\bVersion\/([\d\.]+)\b/,/\bOPR\/([\d\.]+)\b/],IE:[/\bMSIE ([\d\.]+\w?)\b/,/\brv:([\d\.]+\w?)\b/],MS_EDGE:/\bEdge\/([\d\.]+)\b/},s=Object.keys(b).reduce(function(n,o){return n[e[o]]=b[o],n},{}),d=n.navigator.userAgent,t={raw:{userAgent:d,os:{},browser:{},device:{}}};if(t.raw.os=Object.keys(O).reduce(function(n,o){return n[O[o]]=W.test(d,N[o]),n},{}),t.raw.browser=Object.keys(e).reduce(function(n,o){return n[e[o]]=W.test(d,r[o]),n},{}),t.raw.device=Object.keys(o).reduce(function(n,e){return n[o[e]]=W.test(d,I[e]),n},{}),t.raw.os_version=Object.keys(i).reduce(function(n,o){return n[i[o]]=W.test(d,S[o]),n},{}),t.os=[O.WINDOWS,O.IOS,O.MAC,O.ANDROID,O.LINUX,O.UNIX,O.FIREFOX_OS,O.CHROME_OS,O.WINDOWS_PHONE,O.PS4,O.VITA].reduce(function(n,o){return n===O.UNKNOWN&&t.raw.os[o]?o:n},O.UNKNOWN),t.browser=[e.CHROME,e.FIREFOX,e.SAFARI,e.OPERA,e.IE,e.MS_EDGE,e.PS4,e.VITA].reduce(function(n,o){return n===e.UNKNOWN&&t.raw.browser[o]?o:n},e.UNKNOWN),t.device=[o.ANDROID,o.I_PAD,o.IPHONE,o.I_POD,o.BLACKBERRY,o.FIREFOX_OS,o.CHROME_BOOK,o.WINDOWS_PHONE,o.PS4,o.VITA].reduce(function(n,e){return n===o.UNKNOWN&&t.raw.device[e]?e:n},o.UNKNOWN),t.os_version=[i.WINDOWS_3_11,i.WINDOWS_95,i.WINDOWS_ME,i.WINDOWS_98,i.WINDOWS_CE,i.WINDOWS_2000,i.WINDOWS_XP,i.WINDOWS_SERVER_2003,i.WINDOWS_VISTA,i.WINDOWS_7,i.WINDOWS_8_1,i.WINDOWS_8,i.WINDOWS_10,i.WINDOWS_PHONE_7_5,i.WINDOWS_PHONE_10,i.WINDOWS_NT_4_0].reduce(function(n,o){return n===i.UNKNOWN&&t.raw.os_version[o]?o:n},i.UNKNOWN),t.browser_version="0",t.browser!==e.UNKNOWN){var _=s[t.browser],D=W.exec(d,_);D&&(t.browser_version=D[1])}return t.isMobile=function(){return[o.ANDROID,o.I_PAD,o.IPHONE,o.I_POD,o.BLACKBERRY,o.FIREFOX_OS,o.CHROME_BOOK,o.WINDOWS_PHONE,o.VITA].some(function(n){return t.device==n})},t.isTablet=function(){return[o.I_PAD,o.FIREFOX_OS,o.CHROME_BOOK].some(function(n){return t.device==n})},t.isDesktop=function(){return[o.PS4,o.UNKNOWN].some(function(n){return t.device==n})},t}]).directive("deviceDetector",["deviceDetector",function(n){return{restrict:"A",link:function(o,e){e.addClass("os-"+n.os),e.addClass("browser-"+n.browser),e.addClass("device-"+n.device)}}}])}(angular);

package.json

 {
   "name": "ng-device-detector",
-  "version": "1.1.6",
+  "version": "1.1.7",
   "devDependencies": {
@@ -5,0 +5,0 @@ "angular": "*",

test/unit.js

@@ -197,3 +197,7 @@ describe("ng-device-detector", function () {
             "windows-phone", "windows-phone-10", "ms-edge", "12.0", "windows-phone", true, false, false);
+
+// Issue 29
+        describeUserAgent("Mozilla/5.0 (X11; CrOS x86_64 4731.85.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36",
+            "chrome-os", "unknown", "chrome", "31.0.1650.63", "chrome-book", true, true, false);
     });
 });

No alert changes

Improved metrics

Total package byte prevSize

58514

increased by1.56%

Number of package files

24

increased by4.35%

Lines of code

883

increased by1.26%

No dependency changes