Skip to content

Commit e037021

Browse files
committed
Merge branch 'master' into dev
2 parents 5b0a08d + d933bc8 commit e037021

24 files changed

+866
-576
lines changed

CHANGELOG.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
1-
## 2.0.1 (XX Mar 2023)
1+
## 2.0.2 (6 Mar 2023)
2+
* fixed: node version restriction [#185](https://github.com/Donaldcwl/browser-image-compression/issues/185)
3+
4+
## 2.0.1 (6 Mar 2023)
25
* feature: preserve Exif metadata for JPEG [#164](https://github.com/Donaldcwl/browser-image-compression/issues/164)
36
* feature: support BMP image compression [#181](https://github.com/Donaldcwl/browser-image-compression/issues/181)
47
* optimized: solved error in sensible CSP environment [#106](https://github.com/Donaldcwl/browser-image-compression/issues/106)

README.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ Javascript module to be run in the web browser for image compression.
1010
- **Multi-thread** (web worker) non-blocking compression is supported through options.
1111

1212

13-
## Upgrade to version 2
14-
Note that core-js is dropped in version 2, please read the [IE support](#ie-support) section.
15-
1613
## Demo / Example
1714
open https://donaldcwl.github.io/browser-image-compression/example/basic.html
1815

@@ -98,7 +95,7 @@ You can download imageCompression from the [dist folder][dist].
9895

9996
Alternatively, you can use a CDN like [delivrjs]:
10097
```html
101-
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/browser-image-compression@2.0.1/dist/browser-image-compression.js"></script>
98+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/browser-image-compression@2.0.2/dist/browser-image-compression.js"></script>
10299
```
103100

104101

coverage/badge.svg

Lines changed: 1 addition & 1 deletion
Loading

coverage/block-navigation.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ var jumpToCode = (function init() {
6363
}
6464

6565
return function jump(event) {
66+
if (
67+
document.getElementById('fileSearch') === document.activeElement &&
68+
document.activeElement != null
69+
) {
70+
// if we're currently focused on the search input, we don't want to navigate
71+
return;
72+
}
73+
6674
switch (event.which) {
6775
case 78: // n
6876
case 74: // j

coverage/coverage-final.json

Lines changed: 7 additions & 5 deletions
Large diffs are not rendered by default.

coverage/coverage-summary.json

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
{"total": {"lines":{"total":295,"covered":239,"skipped":0,"pct":81.01},"statements":{"total":303,"covered":242,"skipped":0,"pct":79.86},"functions":{"total":30,"covered":27,"skipped":0,"pct":90},"branches":{"total":171,"covered":115,"skipped":0,"pct":67.25}}
2-
,"D:\\Projects\\browser-image-compression\\lib\\image-compression.js": {"lines":{"total":61,"covered":60,"skipped":0,"pct":98.36},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":61,"covered":60,"skipped":0,"pct":98.36},"branches":{"total":39,"covered":32,"skipped":0,"pct":82.05}}
3-
,"D:\\Projects\\browser-image-compression\\lib\\index.js": {"lines":{"total":46,"covered":37,"skipped":0,"pct":80.43},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":46,"covered":37,"skipped":0,"pct":80.43},"branches":{"total":30,"covered":17,"skipped":0,"pct":56.66}}
4-
,"D:\\Projects\\browser-image-compression\\lib\\utils.js": {"lines":{"total":188,"covered":142,"skipped":0,"pct":75.53},"functions":{"total":25,"covered":22,"skipped":0,"pct":88},"statements":{"total":196,"covered":145,"skipped":0,"pct":73.97},"branches":{"total":102,"covered":66,"skipped":0,"pct":64.7}}
1+
{"total": {"lines":{"total":414,"covered":371,"skipped":0,"pct":89.61},"statements":{"total":430,"covered":379,"skipped":0,"pct":88.13},"functions":{"total":42,"covered":39,"skipped":0,"pct":92.85},"branches":{"total":216,"covered":153,"skipped":0,"pct":70.83},"branchesTrue":{"total":0,"covered":0,"skipped":0,"pct":100}}
2+
,"D:\\Projects\\browser-image-compression\\lib\\canvastobmp.js": {"lines":{"total":56,"covered":56,"skipped":0,"pct":100},"functions":{"total":7,"covered":7,"skipped":0,"pct":100},"statements":{"total":57,"covered":57,"skipped":0,"pct":100},"branches":{"total":4,"covered":4,"skipped":0,"pct":100}}
3+
,"D:\\Projects\\browser-image-compression\\lib\\copyExifWithoutOrientation.js": {"lines":{"total":44,"covered":41,"skipped":0,"pct":93.18},"functions":{"total":4,"covered":4,"skipped":0,"pct":100},"statements":{"total":50,"covered":43,"skipped":0,"pct":86},"branches":{"total":19,"covered":13,"skipped":0,"pct":68.42}}
4+
,"D:\\Projects\\browser-image-compression\\lib\\image-compression.js": {"lines":{"total":64,"covered":63,"skipped":0,"pct":98.43},"functions":{"total":3,"covered":3,"skipped":0,"pct":100},"statements":{"total":64,"covered":63,"skipped":0,"pct":98.43},"branches":{"total":41,"covered":35,"skipped":0,"pct":85.36}}
5+
,"D:\\Projects\\browser-image-compression\\lib\\index.js": {"lines":{"total":55,"covered":43,"skipped":0,"pct":78.18},"functions":{"total":2,"covered":2,"skipped":0,"pct":100},"statements":{"total":55,"covered":43,"skipped":0,"pct":78.18},"branches":{"total":43,"covered":23,"skipped":0,"pct":53.48}}
6+
,"D:\\Projects\\browser-image-compression\\lib\\utils.js": {"lines":{"total":195,"covered":168,"skipped":0,"pct":86.15},"functions":{"total":26,"covered":23,"skipped":0,"pct":88.46},"statements":{"total":204,"covered":173,"skipped":0,"pct":84.8},"branches":{"total":109,"covered":78,"skipped":0,"pct":71.55}}
57
,"D:\\Projects\\browser-image-compression\\lib\\config\\browser-name.js": {"lines":{"total":0,"covered":0,"skipped":0,"pct":100},"functions":{"total":0,"covered":0,"skipped":0,"pct":100},"statements":{"total":0,"covered":0,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
68
,"D:\\Projects\\browser-image-compression\\lib\\config\\max-canvas-size.js": {"lines":{"total":0,"covered":0,"skipped":0,"pct":100},"functions":{"total":0,"covered":0,"skipped":0,"pct":100},"statements":{"total":0,"covered":0,"skipped":0,"pct":100},"branches":{"total":0,"covered":0,"skipped":0,"pct":100}}
79
}

coverage/favicon.png

-95 Bytes
Loading

coverage/index.html

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,45 @@ <h1>All files</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">79.86% </span>
26+
<span class="strong">88.13% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>242/303</span>
28+
<span class='fraction'>379/430</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">67.25% </span>
33+
<span class="strong">70.83% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>115/171</span>
35+
<span class='fraction'>153/216</span>
3636
</div>
3737

3838

3939
<div class='fl pad1y space-right2'>
40-
<span class="strong">90% </span>
40+
<span class="strong">92.85% </span>
4141
<span class="quiet">Functions</span>
42-
<span class='fraction'>27/30</span>
42+
<span class='fraction'>39/42</span>
4343
</div>
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">81.01% </span>
47+
<span class="strong">89.61% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>239/295</span>
49+
<span class='fraction'>371/414</span>
5050
</div>
5151

5252

5353
</div>
5454
<p class="quiet">
5555
Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
5656
</p>
57+
<template id="filterTemplate">
58+
<div class="quiet">
59+
Filter:
60+
<input oninput="onInput()" type="search" id="fileSearch">
61+
</div>
62+
</template>
5763
</div>
58-
<div class='status-line medium'></div>
64+
<div class='status-line high'></div>
5965
<div class="pad1">
6066
<table class="coverage-summary">
6167
<thead>
@@ -73,18 +79,18 @@ <h1>All files</h1>
7379
</tr>
7480
</thead>
7581
<tbody><tr>
76-
<td class="file medium" data-value="lib"><a href="lib/index.html">lib</a></td>
77-
<td data-value="79.86" class="pic medium">
78-
<div class="chart"><div class="cover-fill" style="width: 79%"></div><div class="cover-empty" style="width: 21%"></div></div>
82+
<td class="file high" data-value="lib"><a href="lib/index.html">lib</a></td>
83+
<td data-value="88.13" class="pic high">
84+
<div class="chart"><div class="cover-fill" style="width: 88%"></div><div class="cover-empty" style="width: 12%"></div></div>
7985
</td>
80-
<td data-value="79.86" class="pct medium">79.86%</td>
81-
<td data-value="303" class="abs medium">242/303</td>
82-
<td data-value="67.25" class="pct medium">67.25%</td>
83-
<td data-value="171" class="abs medium">115/171</td>
84-
<td data-value="90" class="pct high">90%</td>
85-
<td data-value="30" class="abs high">27/30</td>
86-
<td data-value="81.01" class="pct high">81.01%</td>
87-
<td data-value="295" class="abs high">239/295</td>
86+
<td data-value="88.13" class="pct high">88.13%</td>
87+
<td data-value="430" class="abs high">379/430</td>
88+
<td data-value="70.83" class="pct medium">70.83%</td>
89+
<td data-value="216" class="abs medium">153/216</td>
90+
<td data-value="92.85" class="pct high">92.85%</td>
91+
<td data-value="42" class="abs high">39/42</td>
92+
<td data-value="89.61" class="pct high">89.61%</td>
93+
<td data-value="414" class="abs high">371/414</td>
8894
</tr>
8995

9096
<tr>
@@ -109,10 +115,9 @@ <h1>All files</h1>
109115
</div><!-- /wrapper -->
110116
<div class='footer quiet pad2 space-top1 center small'>
111117
Code coverage generated by
112-
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
113-
at Wed Apr 13 2022 03:48:38 GMT+0800 (Hong Kong Standard Time)
118+
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
119+
at 2023-03-06T13:46:27.026Z
114120
</div>
115-
</div>
116121
<script src="prettify.js"></script>
117122
<script>
118123
window.onload = function () {

coverage/lcov-report/block-navigation.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,14 @@ var jumpToCode = (function init() {
6363
}
6464

6565
return function jump(event) {
66+
if (
67+
document.getElementById('fileSearch') === document.activeElement &&
68+
document.activeElement != null
69+
) {
70+
// if we're currently focused on the search input, we don't want to navigate
71+
return;
72+
}
73+
6674
switch (event.which) {
6775
case 78: // n
6876
case 74: // j

coverage/lcov-report/favicon.png

-95 Bytes
Loading

coverage/lcov-report/index.html

Lines changed: 28 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,39 +23,45 @@ <h1>All files</h1>
2323
<div class='clearfix'>
2424

2525
<div class='fl pad1y space-right2'>
26-
<span class="strong">79.86% </span>
26+
<span class="strong">88.13% </span>
2727
<span class="quiet">Statements</span>
28-
<span class='fraction'>242/303</span>
28+
<span class='fraction'>379/430</span>
2929
</div>
3030

3131

3232
<div class='fl pad1y space-right2'>
33-
<span class="strong">67.25% </span>
33+
<span class="strong">70.83% </span>
3434
<span class="quiet">Branches</span>
35-
<span class='fraction'>115/171</span>
35+
<span class='fraction'>153/216</span>
3636
</div>
3737

3838

3939
<div class='fl pad1y space-right2'>
40-
<span class="strong">90% </span>
40+
<span class="strong">92.85% </span>
4141
<span class="quiet">Functions</span>
42-
<span class='fraction'>27/30</span>
42+
<span class='fraction'>39/42</span>
4343
</div>
4444

4545

4646
<div class='fl pad1y space-right2'>
47-
<span class="strong">81.01% </span>
47+
<span class="strong">89.61% </span>
4848
<span class="quiet">Lines</span>
49-
<span class='fraction'>239/295</span>
49+
<span class='fraction'>371/414</span>
5050
</div>
5151

5252

5353
</div>
5454
<p class="quiet">
5555
Press <em>n</em> or <em>j</em> to go to the next uncovered block, <em>b</em>, <em>p</em> or <em>k</em> for the previous block.
5656
</p>
57+
<template id="filterTemplate">
58+
<div class="quiet">
59+
Filter:
60+
<input oninput="onInput()" type="search" id="fileSearch">
61+
</div>
62+
</template>
5763
</div>
58-
<div class='status-line medium'></div>
64+
<div class='status-line high'></div>
5965
<div class="pad1">
6066
<table class="coverage-summary">
6167
<thead>
@@ -73,18 +79,18 @@ <h1>All files</h1>
7379
</tr>
7480
</thead>
7581
<tbody><tr>
76-
<td class="file medium" data-value="lib"><a href="lib/index.html">lib</a></td>
77-
<td data-value="79.86" class="pic medium">
78-
<div class="chart"><div class="cover-fill" style="width: 79%"></div><div class="cover-empty" style="width: 21%"></div></div>
82+
<td class="file high" data-value="lib"><a href="lib/index.html">lib</a></td>
83+
<td data-value="88.13" class="pic high">
84+
<div class="chart"><div class="cover-fill" style="width: 88%"></div><div class="cover-empty" style="width: 12%"></div></div>
7985
</td>
80-
<td data-value="79.86" class="pct medium">79.86%</td>
81-
<td data-value="303" class="abs medium">242/303</td>
82-
<td data-value="67.25" class="pct medium">67.25%</td>
83-
<td data-value="171" class="abs medium">115/171</td>
84-
<td data-value="90" class="pct high">90%</td>
85-
<td data-value="30" class="abs high">27/30</td>
86-
<td data-value="81.01" class="pct high">81.01%</td>
87-
<td data-value="295" class="abs high">239/295</td>
86+
<td data-value="88.13" class="pct high">88.13%</td>
87+
<td data-value="430" class="abs high">379/430</td>
88+
<td data-value="70.83" class="pct medium">70.83%</td>
89+
<td data-value="216" class="abs medium">153/216</td>
90+
<td data-value="92.85" class="pct high">92.85%</td>
91+
<td data-value="42" class="abs high">39/42</td>
92+
<td data-value="89.61" class="pct high">89.61%</td>
93+
<td data-value="414" class="abs high">371/414</td>
8894
</tr>
8995

9096
<tr>
@@ -109,10 +115,9 @@ <h1>All files</h1>
109115
</div><!-- /wrapper -->
110116
<div class='footer quiet pad2 space-top1 center small'>
111117
Code coverage generated by
112-
<a href="https://istanbul.js.org/" target="_blank">istanbul</a>
113-
at Wed Apr 13 2022 03:48:38 GMT+0800 (Hong Kong Standard Time)
118+
<a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
119+
at 2023-03-06T13:46:27.066Z
114120
</div>
115-
</div>
116121
<script src="prettify.js"></script>
117122
<script>
118123
window.onload = function () {
-71 Bytes
Loading

coverage/lcov-report/sorter.js

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,31 @@ var addSorting = (function() {
2424
return getTableHeader().querySelectorAll('th')[n];
2525
}
2626

27+
function onFilterInput() {
28+
const searchValue = document.getElementById('fileSearch').value;
29+
const rows = document.getElementsByTagName('tbody')[0].children;
30+
for (let i = 0; i < rows.length; i++) {
31+
const row = rows[i];
32+
if (
33+
row.textContent
34+
.toLowerCase()
35+
.includes(searchValue.toLowerCase())
36+
) {
37+
row.style.display = '';
38+
} else {
39+
row.style.display = 'none';
40+
}
41+
}
42+
}
43+
44+
// loads the search box
45+
function addSearchBox() {
46+
var template = document.getElementById('filterTemplate');
47+
var templateClone = template.content.cloneNode(true);
48+
templateClone.getElementById('fileSearch').oninput = onFilterInput;
49+
template.parentElement.appendChild(templateClone);
50+
}
51+
2752
// loads all columns
2853
function loadColumns() {
2954
var colNodes = getTableHeader().querySelectorAll('th'),
@@ -162,6 +187,7 @@ var addSorting = (function() {
162187
}
163188
cols = loadColumns();
164189
loadData();
190+
addSearchBox();
165191
addSortIndicators();
166192
enableUI();
167193
};

0 commit comments

Comments
 (0)