Bugfix: Upgrade separator position,

Bugfix: Favicon loading, Bugfix: Url updating
Kiuryy · Feb 20, 2018 · 72327f5 · 72327f5
1 parent cce12ec
commit 72327f5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/dist/js/background.js b/dist/js/background.js
diff --git a/dist/js/extension.js b/dist/js/extension.js
diff --git a/package.json b/package.json
@@ -19,7 +19,7 @@
     "cp-file": "^5.0.0",
     "create-file": "^1.0.1",
     "del": "^3.0.0",
-    "eslint": "^4.18.0",
+    "eslint": "^4.18.1",
     "glob-concat": "^1.0.1",
     "html-minifier": "^3.5.9",
     "jsonminify": "^0.4.1",

diff --git a/src/js/background/image.js b/src/js/background/image.js
@@ -115,7 +115,7 @@
                 let now = +new Date();
 
                 Object.keys(cache).forEach((key) => {
-                    if (now - cache[key].t > 1000 * 60 * 60 * 24 * 5) { // older than 5 days
+                    if (now - cache[key].t > 1000 * 60 * 60 * 24 * 3) { // older than 3 days
                         delete cache[key];
                     }
                 });

diff --git a/src/js/background/upgrade.js b/src/js/background/upgrade.js
@@ -118,13 +118,13 @@
                             try {
                                 Object.entries(d.utility.separators).forEach(([parentId, separators]) => {
                                     if (separators && separators.length > 0) {
-                                        separators.forEach((separator) => {
+                                        separators.forEach((separator, i) => {
                                             b.preventReload = true;
                                             b.helper.bookmarkApi.func.create({
                                                 title: "----------",
                                                 url: "about:blank",
                                                 parentId: parentId,
-                                                index: separator.index || 0
+                                                index: (separator.index || 0) + i
                                             });
                                         });
                                     }

diff --git a/src/js/extension.js b/src/js/extension.js
@@ -225,16 +225,16 @@
          * Initialises the not yet loaded images in the sidebar
          */
         this.initImages = () => {
-            if (this.elements.iframe.hasClass(opts.classes.page.visible)) {
-                $.delay(0).then(() => {
+            $.delay().then(() => {
+                if (this.elements.iframe.hasClass(opts.classes.page.visible)) {
                     this.elements.sidebar.find("img[" + opts.attr.src + "]").forEach((_self) => {
                         let img = $(_self);
                         let src = img.attr(opts.attr.src);
                         img.removeAttr(opts.attr.src);
                         img.attr("src", src);
                     });
-                });
-            }
+                }
+            });
         };
 
         /**

diff --git a/src/js/helper/overlay.js b/src/js/helper/overlay.js
@@ -811,7 +811,6 @@
                     if (entries[i]) { // go through the list one by one and update or delete the bookmark
                         if ($(entries[i]).find("input[type='checkbox']")[0].checked) {
                             let entry = $(entries[i]).data("entry");
-                            console.log(entry);
 
                             new Promise((rslv) => {
                                 if (entry.urlStatusCode === 404) {
@@ -832,6 +831,8 @@
                             }).then(() => {
                                 proceedList(i + 1);
                             });
+                        } else {
+                            proceedList(i + 1);
                         }
                     } else { // all elements iterated -> close overlay and reload sidebar
                         resolve();