1
0
mirror of https://github.com/lancedikson/bowser synced 2024-10-27 20:34:22 +00:00

Merge branch 'release/1.4.1'

This commit is contained in:
Denis Demchenko 2016-07-07 18:19:25 +03:00
commit 47dc65adba
5 changed files with 67 additions and 54 deletions

View File

@ -1,5 +1,8 @@
# Bowser Changelog
### 1.4.1 (July 7, 2016)
- [FIX] Fix `strictMode` logic for `isUnsupportedBrowser`
### 1.4.0 (June 28, 2016)

View File

@ -7,7 +7,7 @@
"sniff",
"detection"
],
"version": "1.3.0",
"version": "1.4.1",
"homepage": "https://github.com/ded/bowser",
"scripts": [
"src/bowser.js"

View File

@ -7,7 +7,7 @@
"sniff",
"detection"
],
"version": "1.4.0",
"version": "1.4.1",
"homepage": "https://github.com/ded/bowser",
"author": "Dustin Diaz <dustin@dustindiaz.com> (http://dustindiaz.com)",
"main": "./src/bowser.js",

View File

@ -524,12 +524,11 @@
if (minVersions.hasOwnProperty(browser)) {
if (_bowser[browser]) {
// browser version and min supported version.
if (compareVersions([version, minVersions[browser]]) < 0) {
return true; // unsupported
}
return compareVersions([version, minVersions[browser]]) < 0;
}
}
}
return strictMode; // not found
}
@ -538,10 +537,11 @@
*
* @param {Object} minVersions map of minimal version to browser
* @param {Boolean} [strictMode = false] flag to return false if browser wasn't found in map
* @param {String} [ua] user agent string
* @return {Boolean}
*/
function check(minVersions, strictMode) {
return !isUnsupportedBrowser(minVersions, strictMode);
function check(minVersions, strictMode, ua) {
return !isUnsupportedBrowser(minVersions, strictMode, ua);
}
bowser.isUnsupportedBrowser = isUnsupportedBrowser;

View File

@ -112,11 +112,21 @@ describe('Unsupported browser check', function() {
assert.equal(unsupported, false);
});
it('should be passed by #isUnsupportedBrowser for IE10.6 and for IE10 miminal version specified in strict mode', function() {
var unsupported = browser.isUnsupportedBrowser({msie: "10"}, true, this.ie10_6);
assert.equal(unsupported, false);
});
it('should NOT be passed by #check for IE10.6 and for IE11 miminal version specified', function() {
var supported = browser.check({msie: "11"}, this.ie10_6);
assert.equal(supported, false);
});
it('should NOT be passed by #check for IE10.6 and for IE11 miminal version specified in strict mode', function() {
var supported = browser.check({msie: "11"}, true, this.ie10_6);
assert.equal(supported, false);
});
it('should be passed by #check for IE10.6 when version was not specified', function() {
var supported = browser.check({}, this.ie10_6);
assert.equal(supported, true);