Comparing version 2.4.2 to 2.4.3
@@ -6,2 +6,6 @@ | ||
## 2.4.3 (2016-01-25) | ||
* fix(ReferenceError): name is not defined. fixed #92 | ||
## 2.4.2 (2015-12-18) | ||
@@ -8,0 +12,0 @@ |
@@ -67,12 +67,13 @@ "use strict"; | ||
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: name, | ||
name: engineName, | ||
version: ve, | ||
fullVersion: engineVersion, | ||
mode: parseFloat(mode), | ||
fullMode: mode, | ||
mode: parseFloat(engineMode), | ||
fullMode: engineMode, | ||
compatible: ieCore ? ieCore.compatible : false, | ||
@@ -82,6 +83,7 @@ }; | ||
const browserName = d.browser.name; | ||
// IE 内核的浏览器,修复浏览器版本及兼容模式。 | ||
// 仅修改 IE 浏览器的版本,其他 IE 内核的版本不修改。 | ||
let browserVersion = d.browser.fullVersion; | ||
if(d.browser.name === "ie"){ | ||
if(browserName === "ie"){ | ||
browserVersion = ieCore.browserVersion; | ||
@@ -92,3 +94,3 @@ } | ||
d.browser = { | ||
name: name, | ||
name: browserName, | ||
version: vb, | ||
@@ -100,3 +102,3 @@ fullVersion: browserVersion, | ||
}; | ||
d.browser[d.browser.name] = vb; | ||
d.browser[browserName] = vb; | ||
} | ||
@@ -103,0 +105,0 @@ return d; |
{ | ||
"name": "detector", | ||
"version": "2.4.2", | ||
"version": "2.4.3", | ||
"description": "The module for detect client-side information.", | ||
@@ -53,9 +53,7 @@ "homepage": "http://spmjs.io/docs/detector/", | ||
"expect.js": "0.3.1", | ||
"grunt": "~0.4.1", | ||
"grunt-contrib-concat": "~0.3.0", | ||
"grunt-contrib-watch": "0.6.0", | ||
"istanbul": "^0.3.22", | ||
"mocha": "^2.3.3" | ||
"mocha": "^2.3.3", | ||
"spm": "~3.6.12" | ||
}, | ||
"browser": "./web-detector.js" | ||
} |
@@ -414,1 +414,5 @@ # detector | ||
* Not Available version will be `-1`. | ||
## Releases | ||
https://github.com/hotoo/detector/tree/gh-pages |
@@ -963,3 +963,3 @@ "use strict"; | ||
browser: "micromessenger/4.5;4.5;o", | ||
engine: "webkit/537.40;537.40;o", | ||
engine: (isBlinkEngine() ? "blink" : "webkit") + "/537.40;537.40;o", | ||
}], | ||
@@ -971,3 +971,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", | ||
}], | ||
@@ -978,3 +978,3 @@ ["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", { | ||
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", | ||
}], | ||
@@ -985,3 +985,3 @@ ["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", { | ||
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", | ||
}], | ||
@@ -992,3 +992,3 @@ ["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", { | ||
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", | ||
}], | ||
@@ -995,0 +995,0 @@ |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
129075
5
1987
418