Merge pull request #2703 from ethereum/publishG

src/app/files/file-explorer.js

@@ -488,7 +488,7 @@ fileExplorer.prototype.toGist = function (id) {
   this.packageFiles(this.files, folder, (error, packaged) => {
     if (error) {
       console.log(error)
-      modalDialogCustom.alert('Failed to create gist: ' + error)
+      modalDialogCustom.alert('Failed to create gist: ' + error.message)
     } else {
       // check for token
       var tokenAccess = this._deps.config.get('settings/gist-access-token')
@@ -550,11 +550,14 @@ fileExplorer.prototype.toGist = function (id) {
 
 // return all the files, except the temporary/readonly ones..
 fileExplorer.prototype.packageFiles = function (filesProvider, directory, callback) {
-  var ret = {}
+  let ret = {}
   filesProvider.resolveDirectory(directory, (error, files) => {
     if (error) callback(error)
     else {
       async.eachSeries(Object.keys(files), (path, cb) => {
+        if (filesProvider.isDirectory(path)) {
+          cb()
+        } else {
           filesProvider.get(path, (error, content) => {
             if (error) return cb(error)
             if (/^\s+$/.test(content) || !content.length) {
@@ -563,6 +566,7 @@ fileExplorer.prototype.packageFiles = function (filesProvider, directory, callba
             ret[path] = { content }
             cb()
           })
+        }
       }, (error) => {
         callback(error, ret)
       })
@@ -617,12 +621,17 @@ fileExplorer.prototype.renderMenuItems = function () {
     items = this.menuItems.map(({action, title, icon}) => {
       if (action === 'uploadFile') {
         return yo`
-          <label id=${action} class="${icon} ${css.newFile}"  title="${title}">
+          <span
+            id=${action}
+            data-id="fileExplorerUploadFile${action}"
+            class="${icon} ${css.newFile}"
+            title="${title}"
+          >
             <input type="file" onchange=${(event) => {
               event.stopPropagation()
               this.uploadFile(event)
             }} multiple />
-          </label>
+          </span>
         `
       } else {
         return yo`

src/app/files/fileProvider.js

@@ -133,6 +133,10 @@ class FileProvider {
     return false
   }
 
+  isDirectory (path) {
+    return window.remixFileSystem.statSync(path).isDirectory()
+  }
+
   /**
    * Removes the folder recursively
    * @param {*} path is the folder to be removed

src/app/tabs/settings-tab.js

@@ -69,11 +69,11 @@ module.exports = class SettingsTab extends ViewPlugin {
 
     // Gist settings
     const token = this.config.get('settings/gist-access-token')
-    const gistAccessToken = yo`<input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" class="border form-control mb-2 ${css.inline}" placeholder="Token">`
+    const gistAccessToken = yo`<input id="gistaccesstoken" data-id="settingsTabGistAccessToken" type="password" class="border form-control-sm mb-2 ${css.inline}" placeholder="Token">`
     if (token) gistAccessToken.value = token
     const removeToken = () => { self.config.set('settings/gist-access-token', ''); gistAccessToken.value = ''; tooltip('Access token removed') }
     const saveToken = () => { this.config.set('settings/gist-access-token', gistAccessToken.value); tooltip('Access token saved') }
-    const gistAddToken = yo`<input class="btn btn-secondary mx-1" id="savegisttoken" data-id="settingsTabSaveGistToken" onclick=${() => saveToken()} value="Save" type="button">`
+    const gistAddToken = yo`<input class="btn btn-sm btn-primary" id="savegisttoken" data-id="settingsTabSaveGistToken" onclick=${() => saveToken()} value="Save" type="button">`
     const gistRemoveToken = yo`<i class="mx-1 fas fa-trash-alt" id="removegisttoken" data-id="settingsTabRemoveGistToken" title="Delete Github access token" onclick=${() => removeToken()}" type="button"></i>`
     this._view.gistToken = yo`<div class="text-secondary mb-0 h6">${gistAccessToken}${gistAddToken}${copyToClipboard(() => gistAccessToken.value)}${gistRemoveToken}</div>`
     this._view.optionVM = yo`<input onchange=${onchangeOption} class="align-middle form-check-input" id="alwaysUseVM" data-id="settingsTabAlwaysUseVM" type="checkbox">`