diff --git a/core/storage-manager.js b/core/storage-manager.js index 91318a15..46c23ea0 100644 --- a/core/storage-manager.js +++ b/core/storage-manager.js @@ -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; diff --git a/manifest.json b/manifest.json index 6bffe53a..96c6501f 100644 --- a/manifest.json +++ b/manifest.json @@ -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}", diff --git a/pages/updates/updates.html b/pages/updates/updates.html index 87179077..b6e51122 100644 --- a/pages/updates/updates.html +++ b/pages/updates/updates.html @@ -25,41 +25,9 @@

New in LocalCDN:

-

Updated

- -

Added

- -

Improved

-

Fixed

@@ -98,6 +66,43 @@
+ Previous Versions
+

2022-12-04 (v2.6.41)

+

Updated

+ +

Added

+ +

Improved

+ +

Fixed

+

2022-11-19 (v2.6.40)

Updated