Merge remote-tracking branch 'origin/develop'

This commit is contained in:
nobody 2022-12-04 15:08:49 +01:00
commit a5ed931b51
No known key found for this signature in database
GPG Key ID: 8F6DE3D614FCFD7A
3 changed files with 54 additions and 58 deletions

View File

@ -120,12 +120,21 @@ storageManager.startImportFilePicker = function () {
};
storageManager.handleImportFilePicker = function () {
return new Promise((resolve) => {
let file = document.getElementById('import-file-picker').files[0];
storageManager._readFile(file)
.then(storageManager._validation);
resolve();
});
let file, reader;
file = document.getElementById('import-file-picker').files[0];
reader = new FileReader();
reader.readAsText(file, 'UTF-8');
reader.onload = (ev) => {
let content = ev.target.result;
try {
storageManager._validation(JSON.parse(content));
} catch (err) {
console.error(`[ LocalCDN ] ${err}`);
alert(err);
}
};
};
@ -143,27 +152,9 @@ storageManager._handleStorageChanged = function (type) {
}
};
storageManager._readFile = function (file) {
return new Promise((resolve, reject) => {
let reader = new FileReader();
reader.onload = () => {
resolve(reader.result);
};
reader.onerror = reject;
reader.readAsText(file);
});
};
storageManager._validation = function (content) {
let imported = {};
try {
JSON.parse(content);
} catch (err) {
console.error(`[ LocalCDN ] ${err}`);
alert(err);
}
// Delete old keys
if (content.whitelistedDomains !== undefined) {
content.allowlistedDomains = content.whitelistedDomains;

View File

@ -1,7 +1,7 @@
{
"manifest_version": 2,
"name": "LocalCDN",
"version": "2.6.41",
"version": "2.6.42",
"browser_specific_settings": {
"gecko": {
"id": "{b86e4813-687a-43e6-ab65-0bde4ab75758}",

View File

@ -25,41 +25,9 @@
<h2>New in LocalCDN:</h2>
</div>
<div class="release-notes-area">
<p>Updated</p>
<ul>
<li>twitter-bootstrap v5.2.2 -> v5.2.3 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1211">#1211</a>)</li>
<li>axios v1.1.3 -> v1.2.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1212">#1212</a>)</li>
<li>socket.io v4.5.3 -> v4.5.4 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1213">#1213</a>)</li>
<li>video.js v7.21.0 -> v7.21.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1214">#1214</a>)</li>
<li>Swiper v8.4.4 -> v8.4.5 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1215">#1215</a>)</li>
<li>mdb-ui-kit v6.0.0 -> v6.0.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1216">#1216</a>)</li>
<li>videojs-seek-buttons v4.0.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1218">#1218</a>)</li>
<li>video.js v8.0.2 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1219">#1219</a>)</li>
<li>tinymce v6.2.0 -> v6.3.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1220">#1220</a>)</li>
<li>findify-bundle v7.1.68 -> v7.1.75 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1221">#1221</a>)</li>
<li>highlight.js v11.6.0 -> v11.7.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1222">#1222</a>)</li>
<li>bootbox.js v6.0.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1224">#1224</a>)</li>
<li>bodymovin v5.9.6 -> v5.10.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1225">#1225</a>)</li>
<li>react-intl v6.2.1 -> v6.2.5 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1227">#1227</a>)</li>
<li>hls.js v1.2.7 -> v1.2.8 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1228">#1228</a>)</li>
<li>react-router v6.3.0 -> v6.4.4 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1231">#1231</a>)</li>
<li>paginationjs v2.1.5 -> v2.3.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1232">#1232</a>)</li>
<li>d3 v7.6.1 -> v7.7.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1235">#1235</a>)</li>
</ul>
<p>Added</p>
<ul>
<li>knockout v3.4.2 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1210">#1210</a>)</li>
<li>knockout.mapping v2.4.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1210">#1210</a>)</li>
<li>MathJax v3 tex-chtml.js (<a href="https://codeberg.org/nobody/LocalCDN/issues/1229">#1229</a>)</li>
</ul>
<p>Improved</p>
<ul>
<li>Block all non GET requests to CDN (<a href="https://codeberg.org/nobody/LocalCDN/issues/1226">#1226</a>)</li>
<li>Settings import function improved (<a href="https://codeberg.org/nobody/LocalCDN/issues/1234">#1234</a>)</li>
</ul>
<p>Fixed</p>
<ul>
<li>Synchronize settings (<a href="https://codeberg.org/nobody/LocalCDN/issues/1223">#1223</a>)</li>
<li>Settings import function (<a href="https://codeberg.org/nobody/LocalCDN/issues/1234">#1234</a>)</li>
</ul>
</div>
<div id="generator-section">
@ -98,6 +66,43 @@
</div>
<div id="history"><span id="history-indicator">+</span> Previous Versions</div>
<div id="history-release-notes">
<p class='release-date'>2022-12-04 (v2.6.41)</p>
<p>Updated</p>
<ul>
<li>twitter-bootstrap v5.2.2 -> v5.2.3 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1211">#1211</a>)</li>
<li>axios v1.1.3 -> v1.2.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1212">#1212</a>)</li>
<li>socket.io v4.5.3 -> v4.5.4 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1213">#1213</a>)</li>
<li>video.js v7.21.0 -> v7.21.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1214">#1214</a>)</li>
<li>Swiper v8.4.4 -> v8.4.5 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1215">#1215</a>)</li>
<li>mdb-ui-kit v6.0.0 -> v6.0.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1216">#1216</a>)</li>
<li>videojs-seek-buttons v4.0.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1218">#1218</a>)</li>
<li>video.js v8.0.2 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1219">#1219</a>)</li>
<li>tinymce v6.2.0 -> v6.3.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1220">#1220</a>)</li>
<li>findify-bundle v7.1.68 -> v7.1.75 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1221">#1221</a>)</li>
<li>highlight.js v11.6.0 -> v11.7.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1222">#1222</a>)</li>
<li>bootbox.js v6.0.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1224">#1224</a>)</li>
<li>bodymovin v5.9.6 -> v5.10.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1225">#1225</a>)</li>
<li>react-intl v6.2.1 -> v6.2.5 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1227">#1227</a>)</li>
<li>hls.js v1.2.7 -> v1.2.8 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1228">#1228</a>)</li>
<li>react-router v6.3.0 -> v6.4.4 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1231">#1231</a>)</li>
<li>paginationjs v2.1.5 -> v2.3.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1232">#1232</a>)</li>
<li>d3 v7.6.1 -> v7.7.0 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1235">#1235</a>)</li>
</ul>
<p>Added</p>
<ul>
<li>knockout v3.4.2 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1210">#1210</a>)</li>
<li>knockout.mapping v2.4.1 (<a href="https://codeberg.org/nobody/LocalCDN/issues/1210">#1210</a>)</li>
<li>MathJax v3 tex-chtml.js (<a href="https://codeberg.org/nobody/LocalCDN/issues/1229">#1229</a>)</li>
</ul>
<p>Improved</p>
<ul>
<li>Block all non GET requests to CDN (<a href="https://codeberg.org/nobody/LocalCDN/issues/1226">#1226</a>)</li>
<li>Settings import function improved (<a href="https://codeberg.org/nobody/LocalCDN/issues/1234">#1234</a>)</li>
</ul>
<p>Fixed</p>
<ul>
<li>Synchronize settings (<a href="https://codeberg.org/nobody/LocalCDN/issues/1223">#1223</a>)</li>
</ul>
<p class='release-date'>2022-11-19 (v2.6.40)</p>
<p>Updated</p>
<ul>