Issue 5057 - Update adblockpluscore dependency to revision 3bdddf0e8343

chrome/content/ui/filters-backup.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2017 eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 79 matching lines @@
 
   /**
    * Called when the Restore menu is being opened, fills in "Automated backup"
    * entries.
    */
   fillRestorePopup: function()
   {
     while (this.restoreInsertionPoint.nextSibling && !this.restoreInsertionPoint.nextSibling.id)
       this.restoreInsertionPoint.parentNode.removeChild(this.restoreInsertionPoint.nextSibling);
 
-    let files = FilterStorage.getBackupFiles().reverse();
-    for (let i = 0; i < files.length; i++)
+    FilterStorage.getBackupFiles().then(backups =>
     {
-      let file = files[i];
-      let item = this.restoreTemplate.cloneNode(true);
-      let label = item.getAttribute("label");
-      label = label.replace(/\?1\?/, Utils.formatTime(file.lastModifiedTime));
-      item.setAttribute("label", label);
-      item.addEventListener("command", function()
+      backups.reverse();
+      for (let backup of backups)
       {
-        Backup.restoreAllData(file);
-      }, false);
-      this.restoreInsertionPoint.parentNode.insertBefore(item, this.restoreInsertionPoint.nextSibling);
-    }
+        let item = this.restoreTemplate.cloneNode(true);
+        let label = item.getAttribute("label");
+        label = label.replace(/\?1\?/, Utils.formatTime(backup.lastModified));
+        item.setAttribute("label", label);
+        item.addEventListener("command", function()

[kzar, 2017/03/30 05:45:51]

Nit: Any reason not to use an arrow function here?

[Wladimir Palant, 2017/03/30 10:13:11]

I'd rather not make unnecessary changes to this code.

+        {
+          Backup.restoreAllData(backup.file);
+        }, false);
+        this.restoreInsertionPoint.parentNode.insertBefore(item, this.restoreInsertionPoint.nextSibling);

[kzar, 2017/03/30 05:45:51]

Nit: Long line.

[Wladimir Palant, 2017/03/30 10:13:11]

Same here, I'd rather not make unnecessary changes to this code.

+      }
+    });
   },
 
   /**
    * Lets the user choose a file to restore filters from.
    */
   restoreFromFile: function()
   {
     let picker = Cc["@mozilla.org/filepicker;1"].createInstance(Ci.nsIFilePicker);
     picker.init(window, E("backupButton").getAttribute("_restoreDialogTitle"), picker.modeOpen);
     picker.defaultExtension = ".ini";
@@ skipping 222 matching lines @@
         Utils.alert(window, E("backupButton").getAttribute("_backupError"), E("backupButton").getAttribute("_backupDialogTitle"));
       }
     });
   }
 };
 
 window.addEventListener("load", function()
 {
   Backup.init();
 }, false);