Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: remove ensureEven requirement #206

Merged
merged 1 commit into from
Jan 15, 2021
Merged

feat: remove ensureEven requirement #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions src/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,10 @@ export default class ImgixClient {
return this.targetWidthsCache[cacheKey];
}

const ensureEven = (n) => {
return 2 * Math.round(n / 2);
};

let tempWidth = _minWidth;
while (resolutions[resolutions.length - 1] < _maxWidth) {
tempWidth *= 1 + INCREMENT_PERCENTAGE * 2;
resolutions.push(Math.min(ensureEven(tempWidth), _maxWidth));
resolutions.push(Math.min(Math.round(tempWidth), _maxWidth));
}

this.targetWidthsCache[cacheKey] = resolutions;
Expand Down
16 changes: 6 additions & 10 deletions test/build/test-buildSrcSet.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,11 @@ var ImgixClient = /*#__PURE__*/function () {
return this.targetWidthsCache[cacheKey];
}

var ensureEven = function ensureEven(n) {
return 2 * Math.round(n / 2);
};

var tempWidth = _minWidth;

while (resolutions[resolutions.length - 1] < _maxWidth) {
tempWidth *= 1 + INCREMENT_PERCENTAGE * 2;
resolutions.push(Math.min(ensureEven(tempWidth), _maxWidth));
resolutions.push(Math.min(Math.round(tempWidth), _maxWidth));
}

this.targetWidthsCache[cacheKey] = resolutions;
Expand All @@ -432,7 +428,7 @@ describe('SrcSet Builder:', function describeSuite() {
assert(cachedValue !== undefined && cachedValue.length == 31);
});
it('should generate the expected default srcset pair values', function testSpec() {
var resolutions = [100, 116, 134, 156, 182, 210, 244, 282, 328, 380, 442, 512, 594, 688, 798, 926, 1074, 1246, 1446, 1678, 1946, 2258, 2618, 3038, 3524, 4088, 4742, 5500, 6380, 7400, 8192];
var resolutions = [100, 116, 135, 156, 181, 210, 244, 283, 328, 380, 441, 512, 594, 689, 799, 927, 1075, 1247, 1446, 1678, 1946, 2257, 2619, 3038, 3524, 4087, 4741, 5500, 6380, 7401, 8192];
var srclist = srcset.split(',');
var src = srclist.map(function (srcline) {
return parseInt(srcline.split(' ')[1].slice(0, -1), 10);
Expand Down Expand Up @@ -599,7 +595,7 @@ describe('SrcSet Builder:', function describeSuite() {
h: 100
});
it('should generate the expected default srcset pair values', function testSpec() {
var resolutions = [100, 116, 134, 156, 182, 210, 244, 282, 328, 380, 442, 512, 594, 688, 798, 926, 1074, 1246, 1446, 1678, 1946, 2258, 2618, 3038, 3524, 4088, 4742, 5500, 6380, 7400, 8192];
var resolutions = [100, 116, 135, 156, 181, 210, 244, 283, 328, 380, 441, 512, 594, 689, 799, 927, 1075, 1247, 1446, 1678, 1946, 2257, 2619, 3038, 3524, 4087, 4741, 5500, 6380, 7401, 8192];
var srclist = srcset.split(',');
var src = srclist.map(function (srcline) {
return parseInt(srcline.split(' ')[1].slice(0, -1), 10);
Expand Down Expand Up @@ -792,7 +788,7 @@ describe('SrcSet Builder:', function describeSuite() {
assert.strictEqual(srcset.split(',').length, 31);
});
it('should generate the expected default srcset pair values', function testSpec() {
var resolutions = [100, 116, 134, 156, 182, 210, 244, 282, 328, 380, 442, 512, 594, 688, 798, 926, 1074, 1246, 1446, 1678, 1946, 2258, 2618, 3038, 3524, 4088, 4742, 5500, 6380, 7400, 8192];
var resolutions = [100, 116, 135, 156, 181, 210, 244, 283, 328, 380, 441, 512, 594, 689, 799, 927, 1075, 1247, 1446, 1678, 1946, 2257, 2619, 3038, 3524, 4087, 4741, 5500, 6380, 7401, 8192];
var srclist = srcset.split(',');
var src = srclist.map(function (srcline) {
return parseInt(srcline.split(' ')[1].slice(0, -1), 10);
Expand Down Expand Up @@ -1065,7 +1061,7 @@ describe('SrcSet Builder:', function describeSuite() {
assert.strictEqual(srcset.split(',').length, 11);
});
it('should generate the expected default srcset pair values', function testSpec() {
var resolutions = [500, 580, 672, 780, 906, 1050, 1218, 1414, 1640, 1902, 2000];
var resolutions = [500, 580, 673, 780, 905, 1050, 1218, 1413, 1639, 1901, 2000];
var srclist = srcset.split(',');
var src = srclist.map(function (srcline) {
return parseInt(srcline.split(' ')[1].slice(0, -1), 10);
Expand Down Expand Up @@ -1181,7 +1177,7 @@ describe('SrcSet Builder:', function describeSuite() {
assert.equal(srcset.split(',').length, 15);
});
it('should generate the expected default srcset pair values', function testSpec() {
var resolutions = [100, 140, 196, 274, 384, 538, 752, 1054, 1476, 2066, 2892, 4050, 5670, 7938, 8192];
var resolutions = [100, 140, 196, 274, 384, 538, 753, 1054, 1476, 2066, 2893, 4050, 5669, 7937, 8192];
var srclist = srcset.split(',');
var src = srclist.map(function (srcline) {
return parseInt(srcline.split(' ')[1].slice(0, -1), 10);
Expand Down
6 changes: 1 addition & 5 deletions test/build/test-buildURL.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,11 @@ var ImgixClient = /*#__PURE__*/function () {
return this.targetWidthsCache[cacheKey];
}

var ensureEven = function ensureEven(n) {
return 2 * Math.round(n / 2);
};

var tempWidth = _minWidth;

while (resolutions[resolutions.length - 1] < _maxWidth) {
tempWidth *= 1 + INCREMENT_PERCENTAGE * 2;
resolutions.push(Math.min(ensureEven(tempWidth), _maxWidth));
resolutions.push(Math.min(Math.round(tempWidth), _maxWidth));
}

this.targetWidthsCache[cacheKey] = resolutions;
Expand Down
6 changes: 1 addition & 5 deletions test/build/test-client.cjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,15 +397,11 @@ var ImgixClient = /*#__PURE__*/function () {
return this.targetWidthsCache[cacheKey];
}

var ensureEven = function ensureEven(n) {
return 2 * Math.round(n / 2);
};

var tempWidth = _minWidth;

while (resolutions[resolutions.length - 1] < _maxWidth) {
tempWidth *= 1 + INCREMENT_PERCENTAGE * 2;
resolutions.push(Math.min(ensureEven(tempWidth), _maxWidth));
resolutions.push(Math.min(Math.round(tempWidth), _maxWidth));
}

this.targetWidthsCache[cacheKey] = resolutions;
Expand Down
104 changes: 53 additions & 51 deletions test/test-buildSrcSet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,34 +24,34 @@ describe('SrcSet Builder:', function describeSuite() {
let resolutions = [
100,
116,
134,
135,
156,
182,
181,
210,
244,
282,
283,
328,
380,
442,
441,
512,
594,
688,
798,
926,
1074,
1246,
689,
799,
927,
1075,
1247,
1446,
1678,
1946,
2258,
2618,
2257,
2619,
3038,
3524,
4088,
4742,
4087,
4741,
5500,
6380,
7400,
7401,
8192,
];
let srclist = srcset.split(',');
Expand Down Expand Up @@ -251,36 +251,37 @@ describe('SrcSet Builder:', function describeSuite() {
let resolutions = [
100,
116,
134,
135,
156,
182,
181,
210,
244,
282,
283,
328,
380,
442,
441,
512,
594,
688,
798,
926,
1074,
1246,
689,
799,
927,
1075,
1247,
1446,
1678,
1946,
2258,
2618,
2257,
2619,
3038,
3524,
4088,
4742,
4087,
4741,
5500,
6380,
7400,
7401,
8192,
];

let srclist = srcset.split(',');
let src = srclist.map(function (srcline) {
return parseInt(srcline.split(' ')[1].slice(0, -1), 10);
Expand Down Expand Up @@ -507,36 +508,37 @@ describe('SrcSet Builder:', function describeSuite() {
let resolutions = [
100,
116,
134,
135,
156,
182,
181,
210,
244,
282,
283,
328,
380,
442,
441,
512,
594,
688,
798,
926,
1074,
1246,
689,
799,
927,
1075,
1247,
1446,
1678,
1946,
2258,
2618,
2257,
2619,
3038,
3524,
4088,
4742,
4087,
4741,
5500,
6380,
7400,
7401,
8192,
];

let srclist = srcset.split(',');
let src = srclist.map(function (srcline) {
return parseInt(srcline.split(' ')[1].slice(0, -1), 10);
Expand Down Expand Up @@ -850,14 +852,14 @@ describe('SrcSet Builder:', function describeSuite() {
let resolutions = [
500,
580,
672,
673,
780,
906,
905,
1050,
1218,
1414,
1640,
1902,
1413,
1639,
1901,
2000,
];
let srclist = srcset.split(',');
Expand Down Expand Up @@ -992,14 +994,14 @@ describe('SrcSet Builder:', function describeSuite() {
274,
384,
538,
752,
753,
1054,
1476,
2066,
2892,
2893,
4050,
5670,
7938,
5669,
7937,
8192,
];
let srclist = srcset.split(',');
Expand Down