diff --git a/src/apps/editor.ts b/src/apps/editor.ts index 5d3a846..f3643f4 100644 --- a/src/apps/editor.ts +++ b/src/apps/editor.ts @@ -34,7 +34,7 @@ export default class EditorApp implements App { }) if (data != null) { - win.setTitle('Editor - ' + data.path) + win.setTitle(`Editor - ${data.path}`) win.content.style.display = 'flex' win.content.style.flexDirection = 'column' @@ -99,33 +99,29 @@ export default class EditorApp implements App { const fileBtn = win.content.querySelector('#file-open') const editBtn = win.content.querySelector('#edit-open') - const toggleDropdown = function (id: string): void { + const toggleDropdown = (id: string): void => { const el = win.content.querySelector(`#${id}`) el?.classList.toggle('show') } - fileBtn?.addEventListener('click', function (e) { + fileBtn?.addEventListener('click', (e) => { e.stopPropagation() toggleDropdown('file') }) - editBtn?.addEventListener('click', function (e) { + editBtn?.addEventListener('click', (e) => { e.stopPropagation() toggleDropdown('edit') }) - win.content.addEventListener('click', function () { - const file = win.content.querySelector('#file') - const edit = win.content.querySelector('#edit') - if (file !== null) { - if (file.classList.contains('show')) { - toggleDropdown('file') - } + win.content.addEventListener('click', () => { + const file = (win.content.querySelector('#file') as HTMLElement) + const edit = (win.content.querySelector('#edit') as HTMLElement) + if (file.classList.contains('show')) { + toggleDropdown('file') } - if (edit !== null) { - if (edit.classList.contains('show')) { - toggleDropdown('edit') - } + if (edit.classList.contains('show')) { + toggleDropdown('edit') } }) diff --git a/src/apps/files.ts b/src/apps/files.ts index 69ba2ff..91d5b4e 100644 --- a/src/apps/files.ts +++ b/src/apps/files.ts @@ -39,22 +39,22 @@ export default class FilesApp implements App { if (back !== '') { (win.content.querySelector('.back') as HTMLElement).onclick = async () => { if (dir.split('/')[1] === dir.replace('/', '')) { - await setDir('/' + dir.split('/')[0]) + await setDir(`/${dir.split('/')[0]}`) } else { - await setDir('/' + dir.split('/')[1]) + await setDir(`/${dir.split('/')[1]}`) } } } (win.content.querySelector('.file') as HTMLElement).onclick = async () => { const title: string = prompt('Enter file name') ?? 'new-file.txt' - await window.fs.promises.open(dir + '/' + title, 'w') + await window.fs.promises.open(`${dir}/${title}`, 'w') await setDir(dir) } (win.content.querySelector('.folder') as HTMLElement).onclick = async () => { const title: string = prompt('Enter folder name') ?? 'new-folder' - await window.fs.promises.mkdir(dir + '/' + title) + await window.fs.promises.mkdir(`${dir}/${title}`) await setDir(dir) } diff --git a/src/statusbar.ts b/src/statusbar.ts index 3ff1b7c..5111cfc 100644 --- a/src/statusbar.ts +++ b/src/statusbar.ts @@ -27,15 +27,16 @@ class StatusBar { add (item: StatusItem): void { if (this.items.some(x => x.meta.id === item.meta.id)) { console.error(`Unable to register tool; ${item.meta.id} is already registered.`) - } else { - const element = document.createElement('div') - element.setAttribute('data-toolbar-id', item.meta.id) - - this.items.push(item) - this.element.appendChild(element) - - item.run(element) + return } + + const element = document.createElement('div') + element.setAttribute('data-toolbar-id', item.meta.id) + + this.items.push(item) + this.element.appendChild(element) + + item.run(element) } } diff --git a/src/wm.ts b/src/wm.ts index 4e97706..d7da6a4 100644 --- a/src/wm.ts +++ b/src/wm.ts @@ -185,11 +185,7 @@ class WM { const max = Math.max(...indexes) - if (max === -Infinity) { - return 0 - } else { - return max - } + return max === -Infinity ? 0 : max } createWindow (config: FlowWindowConfig): FlowWindow {