Merge pull request #143 from mainIine/beta

Beta
mainIine · Aug 6, 2021 · 6b8eafb · 6b8eafb
2 parents feda940 + 04a4ac3
commit 6b8eafb
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/changelog-de.md b/changelog-de.md
@@ -6,6 +6,9 @@
 - Gildenmitglieder Übersicht:
 	-[#2117](https://github.com/mainIine/foe-helfer-extension/issues/2117) Darstellung der GEX Kalenderwoche ist jetzt der Beginn der GEX und nicht mehr das Ende
 
+- Export der Einstellungen und Daten
+	-[#2119](https://github.com/mainIine/foe-helfer-extension/issues/2119) Weltspezifischer Fehler beim Import der lokalen Einstellungen behoben.
+
 ---
 
 ##### 2.5.9.1

diff --git a/changelog-en.md b/changelog-en.md
@@ -6,6 +6,9 @@
 - Guild members overview:
 	-[#2117](https://github.com/mainIine/foe-helfer-extension/issues/2117) Representation of the GEX calendar week is now the beginning of the GEX and no longer the end
 
+- Export of settings and data
+	-[#2119](https://github.com/mainIine/foe-helfer-extension/issues/2119) Fixed world-specific error when importing local settings.
+
 ---
 
 ##### 2.5.9.1

diff --git a/js/web/dbexport/js/dbexport.js b/js/web/dbexport/js/dbexport.js
@@ -214,7 +214,7 @@ let DBExport = {
                         '<div class="progressbar"><div class="state"></div></div>');
 
                     // check for localStorage
-                    if (file.name.search('localStorage') == 4)
+                    if (file.name.search('localStorage') == 4 || file.name.search('localStorage') == 5)
                     {
                         await DBExport.ImportLocalStorage(file, file.name);
                         $("#debex_import_wrapper").append(`<p class="success">${i18n('Boxes.DBExport.ImportSuccessful')}</p>`);
@@ -248,7 +248,7 @@ let DBExport = {
                                 return Promise.all([
                                     promises.push(zip.file(zipEntry.name).async("blob").then(async function (blob) {
 
-                                        if (zipEntry.name.search('localStorage') == 4)
+                                        if (zipEntry.name.search('localStorage') == 4 || zipEntry.name.search('localStorage') == 5)
                                         {
                                             $("#dbex-loading-data .message").html('<span class="progress">' + (++exportState) + ' / ' + exportCounter + '</span>' +
                                                 '<div class="progressbar"><div class="state" style="width:50%;"></div></div>');
@@ -315,10 +315,12 @@ let DBExport = {
 
         if (!importMeta || !importMeta.data)
         {
-            $("#debex_import_wrapper").append(`<p class="error">${dbName} <span class="icon error">X</span><span class="errmsg">${i18n('Boxes.DBExport.ImportFileError')}</span></p>`);
+            $("#debex_import_wrapper").append(`<p class="error"><span class="icon error">X</span><span class="errmsg">${i18n('Boxes.DBExport.ImportFileError')}</span></p>`);
             return 0;
         }
-        let dbName = importMeta.data.databaseName;
+
+        let dbName = importMeta.data.databaseName ? importMeta.data.databaseName : '';
+
         try
         {
             // check if DB has the right PlayerID and World