Merge pull request #525 from ethereum/fileExplorerCleanup1

src/app.js

@@ -161,21 +161,6 @@ var run = function () {
   var editor = new Editor(document.getElementById('input'))
 
   // ---------------- FilePanel --------------------
-  /****************************************************************************
-  var sources = {
-    'test/client/credit.sol': '',
-    'src/voting.sol': '',
-    'src/leasing.sol': '',
-    'src/gmbh/contract.sol': false,
-    'src/gmbh/test.sol': false,
-    'src/gmbh/company.sol': false,
-    'src/gmbh/node_modules/ballot.sol': false,
-    'src/ug/finance.sol': false,
-    'app/solidity/mode.sol': true,
-    'app/ethereum/constitution.sol': true
-  }
-  Object.keys(sources).forEach(function (key) { files.set(key, sources[key]) })
-  /****************************************************************************/
   var css = csjs`
     .filepanel    {
       display     : flex;
@@ -187,7 +172,7 @@ var run = function () {
   var FilePanelAPI = {
     createName: createNonClashingName,
     switchToFile: switchToFile,
-    ui: ui.event
+    event: this.event
   }
   var el = new FilePanel(FilePanelAPI, files)
   filepanel.appendChild(el)
@@ -215,7 +200,7 @@ var run = function () {
   })
   api.register('focus', function (path) {
     [...window.files.querySelectorAll('.file .name')].forEach(function (span) {
-      if (span.innerText === path) switchToFile(path) // @TODO: scroll into view
+      if (span.innerText === path) switchToFile(path)
     })
   })
   files.event.register('fileRenamed', function (oldName, newName) {
@@ -224,7 +209,15 @@ var run = function () {
     })
   })
   files.event.register('fileRemoved', function (path) {
-    if (path === ui.get('currentFile')) ui.set('currentFile', '')
+    if (path === ui.get('currentFile')) {
+      ui.set('currentFile', '')
+      switchToNextFile()
+    }
+    editor.discard(path)
+    refreshTabs()
+  })
+  files.event.register('fileAdded', function (path) {
+    refreshTabs()
   })
   // ------------------ gist publish --------------
 
@@ -342,10 +335,6 @@ var run = function () {
     if (confirm('Are you sure you want to remove: ' + name + ' from local storage?')) {
       if (!files.remove(name)) {
         alert('Error while removing file')
-      } else {
-        ui.set('currentFile', '')
-        switchToNextFile()
-        editor.discard(name)
       }
     }
     return false
@@ -363,6 +352,7 @@ var run = function () {
     } else {
       editor.open(file, files.get(file))
     }
+    self.event.trigger('currentFileChanged', [file])
   }
 
   function switchToNextFile () {
@@ -394,10 +384,6 @@ var run = function () {
     }
     $('#input').toggle(currentFileOpen)
     $('#output').toggle(currentFileOpen)
-
-    $filesEl.animate({ left: Math.max((0 - activeFilePos() + (FILE_SCROLL_DELTA / 2)), 0) + 'px' }, 'slow', function () {
-      reAdjust()
-    })
   }
 
   var $scrollerRight = $('.scroller-right')

src/app/file-explorer.js

@@ -37,7 +37,6 @@ module.exports = fileExplorer
 
 function fileExplorer (appAPI, files) {
   var fileEvents = files.event
-  var appUI = appAPI.ui
   var tv = new Treeview({
     extractData: function (value, tree, key) {
       var newValue = {}
@@ -76,11 +75,12 @@ function fileExplorer (appAPI, files) {
     </span>
   `
 
-  appUI.register('currentFile', fileFocus)
+  appAPI.event.register('currentFileChanged', (newFile) => {
+    fileFocus(newFile)
+  })
   fileEvents.register('fileRemoved', fileRemoved)
   fileEvents.register('fileRenamed', fileRenamed)
   fileEvents.register('fileAdded', fileAdded)
-  fileEvents.register('fileChanged', fileChanged)
 
   var filepath = null
   var focusElement = null
@@ -216,8 +216,6 @@ function fileExplorer (appAPI, files) {
     })
   }
 
-  function fileChanged (filepath) { }
-
   function fileFocus (path) {
     if (filepath === path) return
     filepath = path
@@ -253,8 +251,6 @@ function fileExplorer (appAPI, files) {
     el.className = css.fileexplorer
     element.parentElement.replaceChild(el, element)
     element = el
-    fileFocus(filepath)
-    appAPI.switchToFile(filepath)
   }
 
   element.api = api

src/app/files.js

@@ -138,12 +138,9 @@ function Files (storage) {
     var tree = {}
 
     var self = this
-    storage.keys().forEach(function (path) {
-      // NOTE: as a temporary measure do not show the config file
-      if (path === '.remix.config') {
-        return
-      }
-
+    // This does not include '.remix.config', because it is filtered
+    // inside list().
+    Object.keys(this.list()).forEach(function (path) {
       hashmapize(tree, path, {
         '/readonly': self.isReadOnly(path),
         '/content': self.get(path)

src/app/storage.js

@@ -39,17 +39,17 @@ function Storage (prefix) {
 
   this.keys = function () {
     return safeKeys()
-      // filter any names not including sol:
+      // filter any names not including the prefix
       .filter(function (item) { return item.indexOf(prefix, 0) === 0 })
-      // remove sol: from filename
-      .map(function (item) { return item.replace(/^sol:/, '') })
+      // remove prefix from filename
+      .map(function (item) { return item.substr(prefix.length) })
   }
 
   // on startup, upgrade the old storage layout
   safeKeys().forEach(function (name) {
     if (name.indexOf('sol-cache-file-', 0) === 0) {
       var content = window.localStorage.getItem(name)
-      window.localStorage.setItem(name.replace(/^sol-cache-file-/, prefix), content)
+      window.localStorage.setItem(name.replace(/^sol-cache-file-/, 'sol:'), content)
       window.localStorage.removeItem(name)
     }
   })