fixes after review

pull/1/head
LianaHus 5 years ago
parent 085afff8db
commit b9689481d3
  1. 7
      src/app/files/file-explorer.js
  2. 4
      src/app/files/fileProvider.js

@ -587,7 +587,7 @@ fileExplorer.prototype.copyFiles = function () {
fileExplorer.prototype.createNewFile = function (parentFolder = 'browser') { fileExplorer.prototype.createNewFile = function (parentFolder = 'browser') {
let self = this let self = this
modalDialogCustom.prompt('Create new file', 'File Name (e.g Untitled.sol)', 'Untitled.sol', (input) => { 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) => { helper.createNonClashingName(parentFolder + '/' + input, self.files, (error, newName) => {
if (error) return tooltip('Failed to create file ' + newName + ' ' + error) 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) { fileExplorer.prototype.createNewFolder = function (parentFolder) {
let self = this let self = this
modalDialogCustom.prompt('Create new folder', '', 'New folder', (input) => { modalDialogCustom.prompt('Create new folder', '', 'New folder', (input) => {
if (input === '') { if (!input) {
tooltip('Failed to create folder. The name can not be empty') return tooltip('Failed to create folder. The name can not be empty')
return false
} }
const currentPath = !parentFolder ? self._deps.fileManager.currentPath() : parentFolder const currentPath = !parentFolder ? self._deps.fileManager.currentPath() : parentFolder

@ -147,10 +147,10 @@ class FileProvider {
this.event.trigger('fileRemoved', [this._normalizePath(path)]) this.event.trigger('fileRemoved', [this._normalizePath(path)])
return true return true
} else { } else {
let items = window.remixFileSystem.readdirSync(path) const items = window.remixFileSystem.readdirSync(path)
if (items.length !== 0) { if (items.length !== 0) {
items.forEach((item, index) => { items.forEach((item, index) => {
let curPath = path + '/' + item const curPath = `${path}/${item}`
if (window.remixFileSystem.statSync(curPath).isDirectory()) { // delete folder if (window.remixFileSystem.statSync(curPath).isDirectory()) { // delete folder
this.remove(curPath) this.remove(curPath)
} else { // delete file } else { // delete file

Loading…
Cancel
Save