From 6ae754da7a37b57f0ccbc601248f6fa7ae631806 Mon Sep 17 00:00:00 2001 From: LianaHus Date: Tue, 12 Nov 2019 12:00:06 +0100 Subject: [PATCH] fixes after review --- src/app/files/file-explorer.js | 7 +++---- src/app/files/fileProvider.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js index cfc8a58867..c172d0e421 100644 --- a/src/app/files/file-explorer.js +++ b/src/app/files/file-explorer.js @@ -587,7 +587,7 @@ fileExplorer.prototype.copyFiles = function () { fileExplorer.prototype.createNewFile = function (parentFolder = 'browser') { let self = this modalDialogCustom.prompt('Create new file', 'File Name (e.g Untitled.sol)', 'Untitled.sol', (input) => { - if (input === '') input = 'New file' + if (!input) input = 'New file' helper.createNonClashingName(parentFolder + '/' + input, self.files, (error, newName) => { if (error) return tooltip('Failed to create file ' + newName + ' ' + error) @@ -606,9 +606,8 @@ fileExplorer.prototype.createNewFile = function (parentFolder = 'browser') { fileExplorer.prototype.createNewFolder = function (parentFolder) { let self = this modalDialogCustom.prompt('Create new folder', '', 'New folder', (input) => { - if (input === '') { - tooltip('Failed to create folder. The name can not be empty') - return false + if (!input) { + return tooltip('Failed to create folder. The name can not be empty') } const currentPath = !parentFolder ? self._deps.fileManager.currentPath() : parentFolder diff --git a/src/app/files/fileProvider.js b/src/app/files/fileProvider.js index 8aaf2d238f..ce1605c142 100644 --- a/src/app/files/fileProvider.js +++ b/src/app/files/fileProvider.js @@ -147,10 +147,10 @@ class FileProvider { this.event.trigger('fileRemoved', [this._normalizePath(path)]) return true } else { - let items = window.remixFileSystem.readdirSync(path) + const items = window.remixFileSystem.readdirSync(path) if (items.length !== 0) { items.forEach((item, index) => { - let curPath = path + '/' + item + const curPath = `${path}/${item}` if (window.remixFileSystem.statSync(curPath).isDirectory()) { // delete folder this.remove(curPath) } else { // delete file