Loading files...
Removing...
Connecting...
Loading files...
Saving file... ${state.savingProgress}
Transferring file... ${state.transferringProgress}
+
+
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
index 80656a5..f008c4b 100644
--- a/ui/arduino/store.js
+++ b/ui/arduino/store.js
@@ -1021,17 +1021,19 @@ async function store(state, emitter) {
emitter.on('toggle-file-selection', (file, source, event) => {
log('toggle-file-selection', file, source, event)
+ let parentFolder = source == 'board' ? state.boardNavigationPath : state.diskNavigationPath
// Single file selection unless holding keyboard key
if (event && !event.ctrlKey && !event.metaKey) {
state.selectedFiles = [{
fileName: file.fileName,
type: file.type,
source: source,
- parentFolder: file.parentFolder
+ parentFolder: parentFolder
}]
emitter.emit('render')
return
}
+
const isSelected = state.selectedFiles.find((f) => {
return f.fileName === file.fileName && f.source === source
})
@@ -1044,79 +1046,89 @@ async function store(state, emitter) {
fileName: file.fileName,
type: file.type,
source: source,
- parentFolder: file.parentFolder
+ parentFolder: parentFolder
})
}
emitter.emit('render')
})
emitter.on('open-selected-files', async () => {
log('open-selected-files')
- let files = []
+ let filesToOpen = []
+ let filesAlreadyOpen = []
for (let i in state.selectedFiles) {
let selectedFile = state.selectedFiles[i]
- let openFile = null
if (selectedFile.type == 'folder') {
// Don't open folders
continue
}
- if (selectedFile.source == 'board') {
- const fileContent = await serial.loadFile(
- serial.getFullPath(
- '/',
- state.boardNavigationPath,
- selectedFile.fileName
+ // ALl good until here
+
+ const alreadyOpen = state.openFiles.find((f) => {
+ return f.fileName == selectedFile.fileName
+ && f.source == selectedFile.source
+ && f.parentFolder == selectedFile.parentFolder
+ })
+ console.log('already open', alreadyOpen)
+
+ if (!alreadyOpen) {
+ // This file is not open yet,
+ // load content and append it to the list of files to open
+ let file = null
+ if (selectedFile.source == 'board') {
+ const fileContent = await serial.loadFile(
+ serial.getFullPath(
+ state.boardNavigationRoot,
+ state.boardNavigationPath,
+ selectedFile.fileName
+ )
)
- )
- openFile = createFile({
- parentFolder: state.boardNavigationPath,
- fileName: selectedFile.fileName,
- source: selectedFile.source,
- content: fileContent
- })
- openFile.editor.onChange = function() {
- openFile.hasChanges = true
- emitter.emit('render')
- }
- } else if (selectedFile.source == 'disk') {
- const fileContent = await disk.loadFile(
- disk.getFullPath(
- state.diskNavigationRoot,
- state.diskNavigationPath,
- selectedFile.fileName
+ file = createFile({
+ parentFolder: state.boardNavigationPath,
+ fileName: selectedFile.fileName,
+ source: selectedFile.source,
+ content: fileContent
+ })
+ file.editor.onChange = function() {
+ file.hasChanges = true
+ emitter.emit('render')
+ }
+ } else if (selectedFile.source == 'disk') {
+ const fileContent = await disk.loadFile(
+ disk.getFullPath(
+ state.diskNavigationRoot,
+ state.diskNavigationPath,
+ selectedFile.fileName
+ )
)
- )
- openFile = createFile({
- parentFolder: state.diskNavigationPath,
- fileName: selectedFile.fileName,
- source: selectedFile.source,
- content: fileContent
- })
- openFile.editor.onChange = function() {
- openFile.hasChanges = true
- emitter.emit('render')
+ file = createFile({
+ parentFolder: state.diskNavigationPath,
+ fileName: selectedFile.fileName,
+ source: selectedFile.source,
+ content: fileContent
+ })
+ file.editor.onChange = function() {
+ file.hasChanges = true
+ emitter.emit('render')
+ }
}
+ filesToOpen.push(file)
+ } else {
+ // This file is already open,
+ // append it to the list of files that are already open
+ filesAlreadyOpen.push(alreadyOpen)
}
- files.push(openFile)
}
- files = files.filter((f) => { // find files to open
- let isAlready = false
- state.openFiles.forEach((g) => { // check if file is already open
- if (
- g.fileName == f.fileName
- && g.source == f.source
- && g.parentFolder == f.parentFolder
- ) {
- isAlready = true
- }
- })
- return !isAlready
- })
-
- if (files.length > 0) {
- state.openFiles = state.openFiles.concat(files)
- state.editingFile = files[0].id
+ // If opening an already open file, switch to its tab
+ if (filesAlreadyOpen.length > 0) {
+ state.editingFile = filesAlreadyOpen[0].id
}
+ // If there are new files to open, they take priority
+ if (filesToOpen.length > 0) {
+ state.editingFile = filesToOpen[0].id
+ }
+
+ state.openFiles = state.openFiles.concat(filesToOpen)
state.view = 'editor'
emitter.emit('render')
@@ -1303,6 +1315,15 @@ async function store(state, emitter) {
emitter.emit('render')
})
+ win.beforeClose(async () => {
+ const hasChanges = !!state.openFiles.find(f => f.parentFolder && f.hasChanges)
+ if (hasChanges) {
+ const response = await confirm('You may have unsaved changes. Are you sure you want to proceed?', 'Yes', 'Cancel')
+ if (!response) return false
+ }
+ await win.confirmClose()
+ })
+
function createFile(args) {
const {
source,
@@ -1467,26 +1488,9 @@ function canEdit({ selectedFiles }) {
return files.length != 0
}
-function toggleFileSelection({ fileName, source, selectedFiles }) {
- let result = []
- let file = selectedFiles.find((f) => {
- return f.fileName === fileName && f.source === source
- })
- if (file) {
- // filter file out
- result = selectedFiles.filter((f) => {
- return f.fileName !== fileName && f.source !== source
- })
- } else {
- // push file
- selectedFiles.push({ fileName, source })
- }
- return result
-}
-
async function removeBoardFolder(fullPath) {
// TODO: Replace with getting the file tree from the board and deleting one by one
- let output = await serial.execFile('./ui/arduino/helpers.py')
+ let output = await serial.execFile(await getHelperFullPath())
await serial.run(`delete_folder('${fullPath}')`)
}
@@ -1518,7 +1522,7 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {
async function downloadFolder(srcPath, destPath, dataConsumer) {
dataConsumer = dataConsumer || function() {}
await disk.createFolder(destPath)
- let output = await serial.execFile('./ui/arduino/helpers.py')
+ let output = await serial.execFile(await getHelperFullPath())
output = await serial.run(`ilist_all('${srcPath}')`)
let files = []
try {
@@ -1546,3 +1550,20 @@ async function downloadFolder(srcPath, destPath, dataConsumer) {
}
}
}
+
+async function getHelperFullPath() {
+ const appPath = await disk.getAppPath()
+ if (await win.isPackaged()) {
+ return disk.getFullPath(
+ appPath,
+ '..',
+ 'ui/arduino/helpers.py'
+ )
+ } else {
+ return disk.getFullPath(
+ appPath,
+ 'ui/arduino/helpers.py',
+ ''
+ )
+ }
+}
diff --git a/ui/arduino/views/components/elements/editor.js b/ui/arduino/views/components/elements/editor.js
index 81d6fcb..091c6fa 100644
--- a/ui/arduino/views/components/elements/editor.js
+++ b/ui/arduino/views/components/elements/editor.js
@@ -3,26 +3,43 @@ class CodeMirrorEditor extends Component {
super()
this.editor = null
this.content = '# empty file'
+ this.scrollTop = 0
}
+ createElement(content) {
+ if (content) this.content = content
+ return html``
+ }
+
+
load(el) {
const onCodeChange = (update) => {
- // console.log('code change', this.content)
this.content = update.state.doc.toString()
this.onChange()
}
this.editor = createEditor(this.content, el, onCodeChange)
- }
- createElement(content) {
- if (content) this.content = content
- return html``
+ setTimeout(() => {
+ this.editor.scrollDOM.addEventListener('scroll', this.updateScrollPosition.bind(this))
+ this.editor.scrollDOM.scrollTo({
+ top: this.scrollTop,
+ left: 0
+ })
+ }, 10)
}
update() {
return false
}
+ unload() {
+ this.editor.scrollDOM.removeEventListener('scroll', this.updateScrollPosition)
+ }
+
+ updateScrollPosition(e) {
+ this.scrollTop = e.target.scrollTop
+ }
+
onChange() {
return false
}
diff --git a/ui/arduino/views/components/elements/tab.js b/ui/arduino/views/components/elements/tab.js
index f0070f3..6036d6b 100644
--- a/ui/arduino/views/components/elements/tab.js
+++ b/ui/arduino/views/components/elements/tab.js
@@ -57,7 +57,7 @@ function Tab(args) {
}
function selectTab(e) {
- if(e.target.tagName === 'BUTTON' || e.target.tagName === 'IMG') return
+ if(e.target.classList.contains('close-tab')) return
onSelectTab(e)
}
@@ -71,9 +71,9 @@ function Tab(args) {
Loading files...
Removing...
Connecting...
Loading files...
Saving file... ${state.savingProgress}
Transferring file... ${state.transferringProgress}
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies: