detector - npm Package Compare versions

Comparing version 2.2.0 to 2.2.1

detector.js

@@ -63,3 +63,8 @@
   ["aliyun", /\baliyunos\b(?:[\-](\d+))?/],
-  ["meizu", /\b(?:meizu\/|m)([0-9]+)\b/],
+  ["meizu", function(ua) {
+    return ua.indexOf("meizu") >= 0 ?
+      /\bmeizu[\/ ]([a-z0-9]+)\b/
+      :
+      /\bm([0-9x]{1,3})\b/
+  }],
   ["nexus", /\bnexus ([0-9s.]+)/],
@@ -66,0 +71,0 @@ ["huawei", function(ua){

HISTORY.md

@@ -6,2 +6,9 @@
 
+## 2.2.1 (2015-02-13)
+
+* Fixed #75, meizu device rule.
+* Fixed smartisan device and os rules.
+* Update blink engine test case, both available in blink engine and others.
+* Add arale keyword.
+
 ## 2.2.0 (2014-12-18)
@@ -11,3 +18,3 @@
 * #64, Add 增加了大量的杂牌手机设备 (Node)
-* Fixed nokia rule.
+* Fixed `nokia` and some rules.
 * #37, #43, Delete `window.detector` global variable.
@@ -14,0 +21,0 @@

morerule.js

@@ -118,3 +118,3 @@ module.exports = {
     ['hosin', /\bhosin ([a-z0-9]+)/],
-    ['锤子', /; (sm701) build/],
+    ['smartisan', /\bsmartisan\b/],
     ['ephone', /ephone ([a-z0-9]+)/],
@@ -199,2 +199,3 @@ ['佰事讯', /\b(wx9) build/],
   OS: [
+    ['smartisanos', /\bsmartisan os \- ([\d.]+)/],
     ["meego", /\bmeego\b/]
@@ -201,0 +202,0 @@ ],

package.json

 {
   "name": "detector",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "客户端信息识别模块",
@@ -17,3 +17,3 @@ "homepage": "http://spmjs.io/docs/detector/",
   },
-  "keywords": ["utility", "userAgent"],
+  "keywords": ["utility", "userAgent", "arale"],
   "repository": {
@@ -20,0 +20,0 @@ "type": "git",

README.md

@@ -203,3 +203,3 @@ # detector
 * `hosin`
-* `锤子`
+* `smartisan`: [锤子](http://www.smartisan.com/), Smartisan.
 * `ephone`
@@ -252,2 +252,3 @@ * `佰事讯`
 * `meego`: Meego.
+* `smartisan`: 锤子, Smartisan.
 
@@ -254,0 +255,0 @@

tests/detector-spec.js

 
 var expect = require("expect.js");
 var detector = require('../detector');
+var global = this;
 
+function isBlinkEngine(){
+  return "chrome" in global && "CSS" in global;
+}
+
 var UAs = [
@@ -116,3 +121,3 @@ // Windows Blue
     browser: "chrome/24.0.1312.56;24.0.1312.56;o",
-    engine: "webkit/537.17;537.17;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.17;537.17;o"
   }],
@@ -123,3 +128,3 @@ ["Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.99 Safari/537.22", {
     browser: "chrome/25.0.1364.99;25.0.1364.99;o",
-    engine: "webkit/537.22;537.22;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.22;537.22;o"
   }],
@@ -130,3 +135,3 @@ ["Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 Safari/537.31", {
     browser: "chrome/26.0.1410.43;26.0.1410.43;o",
-    engine: "webkit/537.31;537.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.31;537.31;o"
   }],
@@ -138,3 +143,3 @@ // Macintosh Safari.
     browser: "safari/6.0.2;6.0.2;o",
-    engine: "webkit/536.26.17;536.26.17;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.26.17;536.26.17;o"
   }],
@@ -145,3 +150,3 @@ ["Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_3) AppleWebKit/536.28.10 (KHTML, like Gecko) Version/6.0.3 Safari/536.28.10", {
     browser: "safari/6.0.3;6.0.3;o",
-    engine: "webkit/536.28.10;536.28.10;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.28.10;536.28.10;o"
   }],
@@ -166,3 +171,3 @@ // Macintosh, Firefox.
     browser: "opera/15.0.1147.18;15.0.1147.18;o",
-    engine: "webkit/537.36;537.36;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o"
   }],
@@ -175,3 +180,3 @@
     browser: "360/-1;-1;o",
-    engine: "webkit/537.1;537.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.1;537.1;o"
   }],
@@ -190,3 +195,3 @@ // 360 安全浏览器，兼容模式。XXX: 无法识别真实 360 信息。
     browser: "360/-1;-1;o",
-    engine: "webkit/537.17;537.17;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.17;537.17;o"
   }],
@@ -214,3 +219,3 @@ // 360 安全浏览器，兼容模式。XXX: 无法识别真实 360 信息。
     browser: "theworld/-1;-1;o",
-    engine: "webkit/535.11;535.11;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/535.11;535.11;o"
   }],
@@ -229,3 +234,3 @@ // TheWorld 急速版，兼容模式
     browser: "maxthon/4.0.5.4000;4.0.5.4000;o",
-    engine: "webkit/537.1;537.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.1;537.1;o"
   }],
@@ -243,3 +248,3 @@ // QQBrowser
     browser: "qq/3.7;3.7;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -250,3 +255,3 @@ ["HUAWEI U8825D Build/HuaweiU8825D) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -257,3 +262,3 @@ ["HuaweiT8100_TD/1.0 Android/2.2 Release/12.25.2010 Browser/WAP2.0 Profile/MIDP-2.0 Configuration/CLDC-1.1 AppleWebKit/533.1", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -264,3 +269,3 @@ ["HUAWEI-HUAWEI-Y-220T/1.0 Linux/2.6.35.7 Android/2.3.5 Release/11.28.2012 Browser/AppleWebKit533.1 (KHTML%2C like Gecko) Mozilla/5.0 Mobile", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -271,3 +276,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.6; zh-cn; U8818 Build/HuaweiU8818) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -284,3 +289,3 @@ ["JUC (Linux; U; 4.1.2; zh-cn; Nexus S; 480*800) UCWEB8.7.2.214/145/800", {
     browser: "android/4.0;4.0;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -291,3 +296,3 @@ ["Lenovo-A60/S100 Linux/2.6.35.7 Android/2.3.3 Release/04.19.2011 Browser/AppleWebKit533.1 Profile/ Configuration/", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -298,3 +303,3 @@ ["LENOVO-Lenovo-A288t/1.0 Linux/2.6.35.7 Android/2.3.5 Release/08.16.2012 Browser/AppleWebKit533.1 (KHTML%2C like Gecko) Mozilla/5.0 Mobile", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -305,3 +310,3 @@ ["LenovoS899t_TD/1.0 Android/4.0 Release/02.01.2012 Browser/WAP2.0 appleWebkit/534.30; 360browser(securitypay%2Csecurityinstalled); 360(android%2Cuppayplugin); 360 Aphone Browser (4.7.1)", {
     browser: "360/4.7.1;4.7.1;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -312,3 +317,3 @@ ["ZTE-TU960s_TD/1.0 Linux/2.6.35 Android/2.3 Release/9.25.2011 Browser/AppleWebKit533.1", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -319,3 +324,3 @@ ["ZTEU880E_TD/1.0 Linux/2.6.35 Android/2.3 Release/12.15.2011 Browser/AppleWebKit533.1", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -326,3 +331,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.0.3; zh-cn;generic-ZTE U930/Phone Build/IMM76D) AppleWebKit534.30(KHTML%2Clike Gecko)Version/4.0 Mobile Safari/534.30 Id/EA71A15E1E65D2518F09B2C659CA09E1 RV/4.0.1;gngouua1.3.0.g chl/anzhi", {
     browser: "android/4.0;4.0;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -333,3 +338,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.2.2; zh-cn; ZTE-T U880 Build/FRG83G) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -340,3 +345,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; ZTE U795 Build/IMM76D) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -347,3 +352,3 @@ ["ZTEU795+_TD/1.0 Linux/3.0.13 Android/4.0 Release/7.10.2012 Browser/AppleWebKit534.30", {
     browser: "na/-1;-1;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -354,3 +359,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn; ZTE-U V881 Build/GINGERBREAD) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -361,3 +366,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn; vivo E1 Build/GRJ90) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -368,3 +373,3 @@ ["NokiaC7-00/111.040.1511 (Symbian/3; Series60/5.3 Mozilla/5.0; Profile/MIDP-2.1 Configuration/CLDC-1.1 ) AppleWebKit/525 (KHTML%2C like Gecko) Version/3.0 NokiaBrowser/8.3.1.4", {
     browser: "nokia/8.3.1.4;8.3.1.4;o",
-    engine: "webkit/525;525;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/525;525;o"
   }],
@@ -375,3 +380,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.1.5; zh-cn; HTC_X315e Build/IML74K) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -382,3 +387,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.0.3; zh-cn; HTC T328d Build/IML74K) UC AppleWebKit/530+ (KHTML%2C like Gecko) Mobile Safari/530", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/530+;530+;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/530+;530+;o"
   }],
@@ -395,3 +400,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; HTC-T329d/1.11.1401.1) AndroidWebKit/534.30 (KHTML%2C Like Gecko) Version/4.0 Mobile Safari/534.30", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -414,3 +419,3 @@ ["JUC (Linux; U; 2.3.5; zh-cn; HTC Rhyme S510b; 480*800) UCWEB8.7.4.225/145/800", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -421,3 +426,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.0.3; zh-cn; HTC Sensation Z710e Build/IML74K) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -428,3 +433,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.3; zh-cn; HTC Wildfire S A510e Build/GRI40) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -435,3 +440,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.2.1; en-sg; HTC Wildfire Build/FRG83D) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -442,3 +447,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn; HTC Desire S Build/GRJ90) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -449,3 +454,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.2.1; zh-cn; HTC Rezound Build/IML74K) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -456,3 +461,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; HTC One X Build/IMM76D) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -496,3 +501,3 @@ ["HTCT329t_TD/1.0 Android/4.0 release/2012 Browser/WAP2.0 Profile/MIDP-2.0 Configuration/CLDC-1.1", {
     browser: "coolnovo/2.0.6.12;2.0.6.12;o",
-    engine: "webkit/537.17;537.17;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.17;537.17;o"
   }],
@@ -518,3 +523,3 @@ // 枫树浏览器，兼容模式。XXX: 误识别。
     browser: "liebao/-1;-1;o",
-    engine: "webkit/537.1;537.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.1;537.1;o"
   }],
@@ -533,3 +538,3 @@ // 闪游浏览器，兼容模式
     browser: "tao/3.1;3.1;o",
-    engine: "webkit/536.11;536.11;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.11;536.11;o"
   }],
@@ -548,3 +553,3 @@ // 百度浏览器
     browser: "baidu/2.x;2.x;o",
-    engine: "webkit/534.7;534.7;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.7;534.7;o"
   }],
@@ -563,3 +568,3 @@ // 搜狗浏览器
     browser: "sogou/2.x;2.x;o",
-    engine: "webkit/537.17;537.17;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.17;537.17;o"
   }],
@@ -573,3 +578,3 @@
     browser: "chrome/26.0.1410.50;26.0.1410.50;o",
-    engine: "webkit/536.26;536.26;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.26;536.26;o"
   }],
@@ -580,3 +585,3 @@ ["Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_3 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10B329 Safari/8536.25", {
     browser: "safari/6.0;6.0;o",
-    engine: "webkit/536.26;536.26;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.26;536.26;o"
   }],
@@ -600,3 +605,3 @@ ["UCWEB/2.0 (iOS; U; iPh OS 6_1_2; zh-CN; iPh4%2C1) U2/1.0.0 UCBrowser/9.0.1.284 U2/1.0.0 Mobile", {
     browser: "safari/6.0;6.0;o",
-    engine: "webkit/536.26;536.26;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.26;536.26;o"
   }],
@@ -610,3 +615,3 @@
     browser: "webview/-1;-1;o",
-    engine: "webkit/531.21.10;531.21.10;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/531.21.10;531.21.10;o"
   }],
@@ -618,3 +623,3 @@ // iPad mini, MIHtool. WebView.
     browser: "webview/-1;-1;o",
-    engine: "webkit/536.26;536.26;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.26;536.26;o"
   }],
@@ -625,3 +630,3 @@ ["Mozilla/5.0 (iPad; CPU OS 5_0_1 like Mac OS X) AppleWebKit/534.46 (KHTML%2C like Gecko) Mobile/9A405", {
     browser: "webview/-1;-1;o",
-    engine: "webkit/534.46;534.46;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.46;534.46;o"
   }],
@@ -632,3 +637,3 @@ ["Mozilla/5.0 (iPhone; CPU iPhone OS 6_1_2 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Mobile/10B146", {
     browser: "webview/-1;-1;o",
-    engine: "webkit/536.26;536.26;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/536.26;536.26;o"
   }],
@@ -673,3 +678,3 @@ // Windows Phone, IE9
     browser: "chrome/25.0.1364.169;25.0.1364.169;o",
-    engine: "webkit/537.22;537.22;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.22;537.22;o"
   }],
@@ -681,3 +686,3 @@ // 小米浏览器
     browser: "mi/1.0;1.0;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -690,3 +695,3 @@ // 小米手机
     browser: "android/4.0;4.0;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -697,3 +702,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.1.1; zh-cn; M040 Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30", {
     browser: "android/4.0;4.0;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -704,4 +709,22 @@ ["meizu/9|Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn; M9 Build/GRJ90) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
+  ["Mozilla/5.0 (Linux; U; Android 4.2.1; zh-cn; M040 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30", {
+    device: "meizu/040",
+    os: "android/4.2.1",
+    browser: "android/4.0;4.0;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
+  }],
+  ["Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn; MEIZU MX Build/GRJ90) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobiile Safari/533.1", {
+    device: "meizu/mx",
+    os: "android/2.3.5",
+    browser: "android/4.0;4.0;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
+  }],
+  ["Mozilla/5.0 (Linux; U; Android 4.4.2; zh-cn; MX4 Build/KOT49H) AppleWebKit/537.36 (KHTML, like Gecko) Version/4.0 Mobile Safari/537.36", {
+    device: "meizu/x4",
+    os: "android/4.4.2",
+    browser: "android/4.0;4.0;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o"
+  }],
   ["Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; MT15i Build/4.1.B.0.431) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
@@ -711,3 +734,3 @@ device: "sonyericsson/15i",
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -718,3 +741,3 @@ ["CoolPad8190_CMCC_TD/1.0 Linux/3.0.8 Android/4.0 Release/10.15.2012 Browser/AppleWebkit534.3", {
     browser: "na/-1;-1;o",
-    engine: "webkit/534.3;534.3;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.3;534.3;o"
   }],
@@ -725,3 +748,3 @@ ["CoolPad8060_CMCC_TD/1.0 Linux/2.6.35 Android/2.3 Release/8.30.2012 Browser/AppleWebkit533.1", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -738,3 +761,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn;YL-Coolpad_7260A/2.3.002.120217.7260+; 480*800; CUCC/3.0) CoolpadWebkit/533.1", {
     browser: "na/-1;-1;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -745,3 +768,3 @@ ["KONKA-V926/1.0 Linux/2.6.35.7 Android/2.3.5 Release/07.30.2012 Browser/AppleWebKit533.1 (KHTML%2C like Gecko) Mozilla/5.0 Mobile", {
     browser: "na/-1;-1;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -754,3 +777,3 @@
     browser: "uc/8.8.2.274;8.8.2.274;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -767,3 +790,3 @@ ["UCWEB/2.0 (Linux; U; Adr 2.3.5; zh-CN; F-03D) U2/1.0.0 UCBrowser/8.8.3.278 U2/1.0.0 Mobile", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/530+;530+;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/530+;530+;o"
   }],
@@ -775,3 +798,3 @@ // SAMSUNG Android Pad, UC HD.
     browser: "uc/2.3.2.289;2.3.2.289;o",
-    engine: "webkit/534.13;534.13;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.13;534.13;o"
   }],
@@ -782,3 +805,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; SAMSUNG-GT-S7568_TD/1.0 Android/4.0.4 Release/07.15.2012 Browser/AppleWebKit534.30 Build/IMM76D) ApplelWebkit/534.30 (KHTML%2Clike Gecko) Version/4.0 Mobile Safari/534.30", {
     browser: "android/4.0;4.0;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -789,3 +812,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.6; zh-cn; SCH-I779 Build/GINGERBREAD) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -796,3 +819,3 @@ ["Mozilla/5.0 (Linux; U; Android 2.3.7; zh-cn; LG-P500 Build/GRI40) UC AppleWebKit/534.31 (KHTML%2C like Gecko) Mobile Safari/534.31", {
     browser: "uc/-1;-1;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -807,3 +830,3 @@ [{
     browser: "uc/8.7.4.225;8.7.4.225;o",
-    engine: "webkit/534.31;534.31;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.31;534.31;o"
   }],
@@ -829,3 +852,3 @@ [{
     browser: "yandex/14.2.1700.12597;14.2.1700.12597;o",
-    engine: "webkit/537.36;537.36;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o"
   }],
@@ -840,3 +863,3 @@ [{
     browser: "yandex/14.2.1700.0;14.2.1700.0;o",
-    engine: "webkit/537.51.1;537.51.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.51.1;537.51.1;o"
   }],
@@ -851,3 +874,3 @@ [{
     browser: "yandex/14.2.1700.12535.00;14.2.1700.12535.00;o",
-    engine: "webkit/537.36;537.36;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o"
   }],
@@ -862,3 +885,3 @@ [{
     browser: "yandex/14.2.1700.12535.01;14.2.1700.12535.01;o",
-    engine: "webkit/537.36;537.36;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o"
   }],
@@ -873,3 +896,3 @@ [{
     browser: "yandex/1.5.1106.241;1.5.1106.241;o",
-    engine: "webkit/537.4;537.4;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.4;537.4;o"
   }],
@@ -882,3 +905,3 @@
     browser: "ali-ap/2.3.4;2.3.4;o",
-    engine: "webkit/537.51.1;537.51.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.51.1;537.51.1;o"
   }],
@@ -890,3 +913,3 @@ ["Mozilla/5.0 (iPhone; CPU iPhone OS 7_1_1 like Mac OS X) AppleWebKit/537.51.2 (KHTML,  like Gecko) Mobile/11D201 AlipayClient/8.0.0.0110",
     browser: "ali-ap/8.0.0.0110;8.0.0.0110;o",
-    engine: "webkit/537.51.2;537.51.2;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.51.2;537.51.2;o"
   }],
@@ -900,3 +923,3 @@
     browser: "oupeng/10.0.1.82018;10.0.1.82018;o",
-    engine: "webkit/537.36;537.36;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o"
   }],
@@ -909,3 +932,3 @@ //安卓搜狗
     browser: "sogou/3.1.2;3.1.2;o",
-    engine: "webkit/534.30;534.30;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o"
   }],
@@ -918,3 +941,3 @@ //安卓猎豹极速
     browser: "liebao/2.10.0;2.10.0;o",
-    engine: "webkit/535.19;535.19;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/535.19;535.19;o"
   }],
@@ -927,3 +950,3 @@ //百度安卓
     browser: "baidu/5.2.3.0;5.2.3.0;o",
-    engine: "webkit/534.24;534.24;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.24;534.24;o"
   }],
@@ -936,3 +959,3 @@ //小米3 遨游
     browser: "maxthon/4.3.1.2000;4.3.1.2000;o",
-    engine: "webkit/537.51.2;537.51.2;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.51.2;537.51.2;o"
   }],
@@ -945,3 +968,3 @@ // UC桌面浏览器
     browser: "uc/2.0.1288.1;2.0.1288.1;o",
-    engine: "webkit/537.36;537.36;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.36;537.36;o"
   }],
@@ -953,3 +976,3 @@ ["Mozilla/5.0 (Linux; U; Android 4.4.2; zh-CN; MI 3W Build/KVT49L) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 UCBrowser/9.9.2.467 U3/0.8.0 Mobile Safari/533.1",
     browser: "uc/9.9.2.467;9.9.2.467;o",
-    engine: "webkit/533.1;533.1;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o"
   }],
@@ -961,3 +984,3 @@ ["Mozilla/5.0 (iPad; CPU OS 7_1_2 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) BaiduHD/2.6.2 Mobile/10A406 Safari/8536.25",
     browser: "baidu/2.6.2;2.6.2;o",
-    engine: "webkit/534.46;534.46;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.46;534.46;o"
   }],
@@ -971,3 +994,3 @@
     browser: "blackberry/10.1.0.4633;10.1.0.4633;o",
-    engine: "webkit/537.10+;537.10+;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.10+;537.10+;o"
   }],
@@ -979,3 +1002,3 @@ ["Mozilla/5.0 (BlackBerry; U; BlackBerry 9810; en-US) AppleWebKit/534.11+ (KHTML, like Gecko) Version/7.1.0.912 Mobile Safari/534.11+",
     browser: "blackberry/7.1.0.912;7.1.0.912;o",
-    engine: "webkit/534.11+;534.11+;o"
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.11+;534.11+;o"
   }],
@@ -982,0 +1005,0 @@ ["BlackBerry9000/5.0.0.93 Profile/MIDP-2.0 Configuration/CLDC-1.1 VendorID/179",

tests/morerule-test.js

@@ -126,6 +126,13 @@ // more rule test.
     engine: "na/-1;-1;o"
+  }],
+
+  ["Mozilla/5.0 (Linux; U; Android 4.1.1; en-us; Smartisan OS - 4.1.1 - API 16 - 720x1280 Build/JRO03S) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30", {
+    device: "smartisan/-1",
+    os: "smartisanos/4.1.1",
+    browser: "android/4.0;4.0;o",
+    engine: "webkit/534.30;534.30;o"
   }]
 ];
 
-describe("detector", function() {
+describe("detector more rule", function() {
 
@@ -132,0 +139,0 @@ var nav, ua, info, detect;

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

102884

increased by4.81%

Lines of code

1853

increased by1.87%

Number of lines in readme file

398

increased by0.25%

No dependency changes