Fixed: Import settings (#138)

This commit is contained in:
nobody 2020-11-12 06:57:00 +01:00
parent eb0f499217
commit 0a6d78e8c2
No known key found for this signature in database
GPG Key ID: 8F6DE3D614FCFD7A
2 changed files with 8 additions and 1 deletions

View File

@ -81,6 +81,7 @@ storageManager.export = function () {
filename = filename.substring(0, 10) + '_localcdn_backup.txt';
storageManager.type.get(null, function (items) {
delete items['whitelistedDomains'];
let element = document.createElement('a');
element.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(items, null, ' ')));
element.setAttribute('download', filename);
@ -134,6 +135,12 @@ storageManager._readFileAsync = function (file) {
storageManager._validation = function (content) {
let imported = {};
if (Object.keys(content['allowlistedDomains']).length === 0) {
content['allowlistedDomains'] = content['whitelistedDomains'];
}
delete content['whitelistedDomains'];
for (const [key, value] of Object.entries(SettingDefaults)) {
// If type the same as default settings
if (typeof value === typeof content[key]) {
@ -214,7 +221,6 @@ storageManager._validateDomainsAndStatistics = function (type, obj) {
};
storageManager._validateStrings = function (value) {
console.log(value);
if (/((2[0-9])[0-9]{2})-(0[1-9]|1[012])-(0[1-9]|[12][0-9]|3[01])/.test(value)) {
return value;
} else if (/#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/.test(value)) {

View File

@ -43,6 +43,7 @@
<li>Added: GSAP Bundle (<a href="https://codeberg.org/nobody/LocalCDN/issues/171">#171</a>)</li>
<li>Added: Modaal v0.4.4 (<a href="https://codeberg.org/nobody/LocalCDN/issues/172">#172</a>)</li>
<li>Added: inview (Protonet) v1.1.2 (<a href="https://codeberg.org/nobody/LocalCDN/issues/172">#172</a>)</li>
<li>Fixed: Import settings (<a href="https://codeberg.org/nobody/LocalCDN/issues/138">#138</a>)</li>
</ul>
<div id="generator-section">
<div class="topic-label">