fix: name is not defined. fixed #92

hotoo · Jan 25, 2016 · 79564fa · 79564fa
1 parent 3d54e15
commit 79564fa
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/lib/web-detector.js b/lib/web-detector.js
@@ -64,37 +64,39 @@ function WebParse (ua) {
 
   // IE 内核的浏览器，修复版本号及兼容模式。
   if(ieCore) {
+    const engineName = d.engine.name;
     const engineVersion = ieCore.engineVersion || ieCore.engineMode;
     const ve = parseFloat(engineVersion);
-    const mode = ieCore.engineMode;
+    const engineMode = ieCore.engineMode;
 
     d.engine = {
-      name: d.engine.name,
+      name: engineName,
       version: ve,
       fullVersion: engineVersion,
-      mode: parseFloat(mode),
-      fullMode: mode,
+      mode: parseFloat(engineMode),
+      fullMode: engineMode,
       compatible: ieCore ? ieCore.compatible : false,
     };
     d.engine[d.engine.name] = ve;
 
+    const browserName = d.browser.name;
     // IE 内核的浏览器，修复浏览器版本及兼容模式。
     // 仅修改 IE 浏览器的版本，其他 IE 内核的版本不修改。
     let browserVersion = d.browser.fullVersion;
-    if(d.browser.name === "ie"){
+    if(browserName === "ie"){
       browserVersion = ieCore.browserVersion;
     }
     const browserMode = ieCore.browserMode;
     const vb = parseFloat(browserVersion);
     d.browser = {
-      name: d.browser.name,
+      name: browserName,
       version: vb,
       fullVersion: browserVersion,
       mode: parseFloat(browserMode),
       fullMode: browserMode,
       compatible: ieCore ? ieCore.compatible : false,
     };
-    d.browser[d.browser.name] = vb;
+    d.browser[browserName] = vb;
   }
   return d;
 }

diff --git a/tests/detector-spec.js b/tests/detector-spec.js
@@ -960,32 +960,32 @@ const UAs = [
     device: "iphone/-1",
     os: "ios/7.0",
     browser: "micromessenger/4.5;4.5;o",
-    engine: "webkit/537.40;537.40;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.40;537.40;o",
   }],
   // 魅族
   ["Mozilla/5.0 (Linux; U; Android 4.0.3; zh-cn; M030 Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 MicroMessenger/4.2.191", {
     device: "meizu/030",
     os: "android/4.0.3",
     browser: "micromessenger/4.2.191;4.2.191;o",
-    engine: "webkit/534.30;534.30;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/534.30;534.30;o",
   }],
   ["Mozilla/5.0 (iPhone; CPU iPhone OS 8_1_1 like Mac OS X) AppleWebKit/600.1.4 (KHTML, like Gecko) Mobile/12B435 MicroMessenger/6.0.1 NetType/WIFI", {
     device: "iphone/-1",
     os: "ios/8.1.1",
     browser: "micromessenger/6.0.1;6.0.1;o",
-    engine: "webkit/600.1.4;600.1.4;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/600.1.4;600.1.4;o",
   }],
   ["Mozilla/5.0 (Linux; U; Android 4.4.4; zh-cn; M463C Build/KTU84P) AppleWebKit/533.1 (KHTML, like Gecko)Version/4.0 MQQBrowser/5.4 TBS/025440 Mobile Safari/533.1 MicroMessenger/6.2.5.50_r0e62591.621 NetType/WIFI Language/zh_CN", {
     device: "meizu/463c",
     os: "android/4.4.4",
     browser: "micromessenger/6.2.5.50;6.2.5.50;o",
-    engine: "webkit/533.1;533.1;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o",
   }],
   ["Mozilla/5.0 (Linux; U; Android 4.4.2; zh-cn; HUAWEI MT7-CL00 Build/HuaweiMT7-CL00) AppleWebKit/533.1 (KHTML, like Gecko)Version/4.0 MQQBrowser/5.4 TBS/025440 Mobile Safari/533.1 MicroMessenger/6.2.5.51_rfe7d7c5.621 NetType/WIFI Language/zh_CN", {
     device: "huawei/mt7",
     os: "android/4.4.2",
     browser: "micromessenger/6.2.5.51;6.2.5.51;o",
-    engine: "webkit/533.1;533.1;o",
+    engine: (isBlinkEngine() ? "blink" : "webkit") + "/533.1;533.1;o",
   }],
 
   // NA