Commit ac2a7b5d authored by Mark Banner's avatar Mark Banner
Browse files

Bug 1769227 - Remove OS.Path usage from places.js. r=daisuke 

Differential Revision: https://phabricator.services.mozilla.com/D146293
parent c374d74d

browser/components/places/content/places.js

+2 −2
Original line number Original line Diff line number Diff line
@@ -602,7 +602,7 @@ var PlacesOrganizer = { 
          document.getElementById("restoreFromFile")

          document.getElementById("restoreFromFile")

        );

        );

        m.setAttribute("label", dateFormatter.format(backupDate) + sizeInfo);

        m.setAttribute("label", dateFormatter.format(backupDate) + sizeInfo);

        m.setAttribute("value", OS.Path.basename(backupFiles[i]));

        m.setAttribute("value", PathUtils.filename(backupFiles[i]));

        m.setAttribute(

        m.setAttribute(

          "oncommand",

          "oncommand",

          "PlacesOrganizer.onRestoreMenuItemClick(this);"

          "PlacesOrganizer.onRestoreMenuItemClick(this);"
@@ -626,7 +626,7 @@ var PlacesOrganizer = { 
    let backupName = aMenuItem.getAttribute("value");

    let backupName = aMenuItem.getAttribute("value");

    let backupFilePaths = await PlacesBackups.getBackupFiles();

    let backupFilePaths = await PlacesBackups.getBackupFiles();

    for (let backupFilePath of backupFilePaths) {

    for (let backupFilePath of backupFilePaths) {

      if (OS.Path.basename(backupFilePath) == backupName) {

      if (PathUtils.filename(backupFilePath) == backupName) {

        PlacesOrganizer.restoreBookmarksFromFile(backupFilePath);

        PlacesOrganizer.restoreBookmarksFromFile(backupFilePath);

        break;

        break;

      }

      }