Merge pull request #35 from arduino/bugfix/save-without-selecting-folder

Making sure save is disabled

Author: murilopolese

package-lock.json

@@ -48,12 +48,16 @@ function Toolbar(state, emit) {
     onclick: () => emit('open-folder')
   })
 
-  const canSave = (state.isConnected && state.selectedDevice === 'serial' && state.selectedFile)
-               || (state.selectedDevice === 'disk' && state.selectedFile)
+  const canSaveBoard = state.isConnected 
+    && state.selectedDevice === 'serial' 
+    && state.selectedFile
+  const canSaveDisk = state.selectedDevice === 'disk' 
+    && state.selectedFile 
+    && state.diskPath
   const save = Button({
     icon: 'icons/Save.svg',
     label: 'Save',
-    disabled: !canSave,
+    disabled: !canSaveBoard && !canSaveDisk,
     onclick: () => emit('save')
   })
 

ui/arduino/components/toolbar.js

@@ -133,7 +133,7 @@ function store(state, emitter) {
     log('select-device', dev)
     state.selectedDevice = dev
     let editor = state.cache(AceEditor, 'editor').editor
-    state.selectedFile = 'undefined'
+    state.selectedFile = null
     editor.setValue('')
     emitter.emit('close-new-file-dialog')
     emitter.emit('render')
@@ -143,6 +143,7 @@ function store(state, emitter) {
     let editor = state.cache(AceEditor, 'editor').editor
     let contents = editor.getValue()
     let filename = state.selectedFile || 'undefined'
+    let deviceName = state.selectedDevice === 'serial' ? 'board' : 'disk'
 
     if (state.selectedDevice === 'serial') {
       await serial.saveFileContent(filename, contents)
@@ -153,7 +154,7 @@ function store(state, emitter) {
     }
 
     emitter.emit('update-files')
-    emitter.emit('message', `${filename} is saved on ${state.selectedDevice}.`, 1000)
+    emitter.emit('message', `${filename} is saved on ${deviceName}.`, 1000)
   })
   emitter.on('remove', async () => {
     log('remove')
@@ -318,6 +319,7 @@ function store(state, emitter) {
     log('save-filename', filename)
     let oldFilename = state.selectedFile
     state.selectedFile = filename
+    let deviceName = state.selectedDevice === 'serial' ? 'board' : 'disk'
 
     let editor = state.cache(AceEditor, 'editor').editor
     let contents = editor.getValue()
@@ -326,7 +328,6 @@ function store(state, emitter) {
       // Ask for confirmation to overwrite existing file
       let confirmation = true
       if (state.serialFiles.indexOf(filename) !== -1) {
-        let deviceName = state.selectedDevice === 'serial' ? 'board' : 'disk'
         confirmation = confirm(`Do you want to overwrite ${filename} on ${deviceName}?`)
       }
 
@@ -343,7 +344,7 @@ function store(state, emitter) {
         emitter.emit('update-files')
         emitter.emit('render')
 
-        emitter.emit('message', `${filename} is saved on ${state.selectedDevice}.`, 1000)
+        emitter.emit('message', `${filename} is saved on ${deviceName}.`, 1000)
       } else {
         state.isEditingFilename = false
         emitter.emit('render')
@@ -354,7 +355,6 @@ function store(state, emitter) {
       // Ask for confirmation to overwrite existing file
       let confirmation = true
       if (state.diskFiles.indexOf(filename) !== -1) {
-        let deviceName = state.selectedDevice === 'serial' ? 'board' : 'disk'
         confirmation = confirm(`Do you want to overwrite ${filename} on ${deviceName}?`)
       }
       if (confirmation) {
@@ -370,7 +370,7 @@ function store(state, emitter) {
         emitter.emit('update-files')
         emitter.emit('render')
 
-        emitter.emit('message', `${filename} is saved on ${state.selectedDevice}.`, 1000)
+        emitter.emit('message', `${filename} is saved on ${deviceName}.`, 1000)
       } else {
         state.isEditingFilename = false
         emitter.emit('render')