disabled "discard changes" in context menu of FE

ethereum · Dec 9, 2019 · dc540c1 · dc540c1
1 parent 88fcd49
commit dc540c1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js
@@ -209,7 +209,9 @@ function fileExplorer (localRegistry, files, menuItems) {
     const provider = self._deps.fileManager.fileProviderOf(key)
     actions['Create File'] = () => self.createNewFile(key)
     actions['Create Folder'] = () => self.createNewFolder(key)
-    if (provider.isExternalFolder(key)) {
+    // todo not fully implemented. Readd later when fixed
+    // https://github.com/ethereum/remix-ide/issues/2386
+    /* if (provider.isExternalFolder(key)) {
       actions['Discard changes'] = () => {
         modalDialogCustom.confirm(
           'Discard changes',
@@ -218,7 +220,8 @@ function fileExplorer (localRegistry, files, menuItems) {
           () => {}
         )
       }
-    } else {
+    } else { */
+     if (! provider.isExternalFolder(key)) {
       const folderPath = extractExternalFolder(key)
       actions['Rename'] = () => {
         if (self.files.isReadOnly(key)) { return tooltip('cannot rename folder. ' + self.files.type + ' is a read only explorer') }

diff --git a/src/app/files/fileManager.js b/src/app/files/fileManager.js
@@ -59,7 +59,8 @@ class FileManager extends Plugin {
   }
 
   fileChangedEvent (path) {
-    this.syncEditor(path)
+    // todo. use only for discard changes function.
+    //this.syncEditor(path)
   }
 
   fileRenamedEvent (oldName, newName, isFolder) {

diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js
@@ -136,7 +136,7 @@ class CompilerContainer {
       if (pragmaArr && pragmaArr.length === 1) {
         const pragmaStr = pragmaArr[0].replace('pragma solidity', '').trim()
         const pragma = pragmaStr.substring(0, pragmaStr.length - 1)
-        const releasedVersions = this.data.allversions.filter(obj => !obj.prerelease).map(obj => obj.version)
+        const releasedVersions = (this.data.allversions) ? this.data.allversions.filter(obj => !obj.prerelease).map(obj => obj.version) : []
         const allVersions = this.data.allversions.map(obj => this._retrieveVersion(obj.version))
         const currentCompilerName = this._retrieveVersion(this._view.versionSelector.selectedOptions[0].label)
         // contains only numbers part, for example '0.4.22'

diff --git a/src/app/ui/contextMenu.js b/src/app/ui/contextMenu.js
@@ -45,7 +45,7 @@ module.exports = (event, items) => {
     current.onclick = () => { hide(null, true); items[item]() }
     return current
   })
-  var container = yo`<div class="p-1 ${css.container} bg-light"><ul id='menuitems'>${menu}</ul></div>`
+  var container = yo`<div class="p-1 ${css.container} bg-light shadow border"><ul id='menuitems'>${menu}</ul></div>`
   container.style.left = event.pageX + 'px'
   container.style.top = event.pageY + 'px'
   container.style.display = 'block'