Skip to content

Commit 89eeb04

Browse files
committed
#171 remove cancel button
1 parent c3f4f53 commit 89eeb04

2 files changed

Lines changed: 2 additions & 22 deletions

File tree

src/Header.ts

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { ref } from 'lit/directives/ref.js'
33
import { parse, serialize, NamedNode, LiveStore } from 'rdflib'
44
import { widgets, icons } from 'solid-ui'
55
import { getStatusSection } from './StatusSection'
6-
import { applyResponseHeaders, checkSyntax, getResponseHeaders, happy, refresh, setControlVisible, setEdited, setUnedited } from './helpers'
6+
import { applyResponseHeaders, checkSyntax, getResponseHeaders, happy, setControlVisible, setEdited, setUnedited } from './helpers'
77
import { SourcePaneState } from './types'
88
import { compactable } from './compactableFormats'
99
import SourceEditor from './components/sourceEditor/SourceEditor'
@@ -49,13 +49,11 @@ export function renderHeader (store: LiveStore, subject: NamedNode, sourcePaneSt
4949
function setEditable (sourcePaneState: SourcePaneState) {
5050
const editor = document.querySelector('source-editor') as SourceEditor | null
5151
const textArea = editor?.getTextArea()
52-
const cancelButton = document.querySelector('.sourcePaneCancelButton') as HTMLElement
5352
const saveButton = document.querySelector('.sourcePaneSaveButton') as HTMLElement
5453
const myEditButton = document.querySelector('.sourcePaneEditButton') as HTMLElement
5554
const myCompactButton = document.querySelector('.sourcePaneCompactButton') as HTMLElement
5655
if (sourcePaneState.broken) return
5756
sourcePaneState.editing = true
58-
setControlVisible(cancelButton, true) // not logically needed but may be comforting
5957
setControlVisible(saveButton, false)
6058
setControlVisible(myEditButton, false)
6159
setControlVisible(myCompactButton, false) // do not allow compact while editing
@@ -68,8 +66,7 @@ export function renderHeader (store: LiveStore, subject: NamedNode, sourcePaneSt
6866
const compactContentType = contentType?.split(';')[0]
6967
const editor = document.querySelector('source-editor') as SourceEditor | null
7068
const textArea = editor?.getTextArea()
71-
const cancelButton = document.querySelector('.sourcePaneCancelButton') as HTMLElement
72-
const { showError } = getStatusSection()
69+
const { showError } = getStatusSection()
7370

7471
if (compactContentType && compactable[compactContentType]) {
7572
try {
@@ -79,7 +76,6 @@ export function renderHeader (store: LiveStore, subject: NamedNode, sourcePaneSt
7976
serialized.then(result => {
8077
if (typeof result === 'string') textArea.value = result /*return div*/
8178
})
82-
setControlVisible(cancelButton, true)
8379
} catch (e: any) {
8480
showError(String(e))
8581
}
@@ -96,12 +92,6 @@ export function renderHeader (store: LiveStore, subject: NamedNode, sourcePaneSt
9692
<span class="sourcePaneControlHost" ${ref((host: Element | undefined) => {
9793
if (host instanceof HTMLElement) {
9894
mountButton(host, createCompactButton(host.ownerDocument, () => compactHandler(store, subject, sourcePaneState)))
99-
100-
}
101-
})}></span>
102-
<span class="sourcePaneControlHost" ${ref((host: Element | undefined) => {
103-
if (host instanceof HTMLElement) {
104-
mountButton(host, createCancelButton(host.ownerDocument, () => refresh(store, subject, sourcePaneState)))
10595
}
10696
})}></span>
10797
<span class="sourcePaneControlHost" ${ref((host: Element | undefined) => {
@@ -140,15 +130,6 @@ export function createCompactButton (dom: Document, onClick?: EventListener) {
140130
return myCompactButton
141131
}
142132

143-
export function createCancelButton (dom: Document, onClick?: EventListener) {
144-
const myCancelButton = widgets.cancelButton(dom)
145-
myCancelButton.classList.add('sourcePaneCancelButton')
146-
if (onClick) {
147-
myCancelButton.addEventListener('click', onClick)
148-
}
149-
return myCancelButton
150-
}
151-
152133
export function createSaveButton (dom: Document, onClick?: EventListener) {
153134
const mySaveButton = widgets.continueButton(dom)
154135
mySaveButton.classList.add('sourcePaneSaveButton')

src/helpers.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ export function setControlVisible (button: HTMLElement | null, visible: boolean)
146146
}
147147

148148
export function setUnedited (subject: NamedNode, sourcePaneState: SourcePaneState, textArea: HTMLTextAreaElement) {
149-
const cancelButton = document.querySelector('.sourcePaneCancelButton') as HTMLElement
150149
const saveButton = document.querySelector('.sourcePaneSaveButton') as HTMLElement
151150
const myEditButton = document.querySelector('.sourcePaneEditButton') as HTMLElement
152151
const myCompactButton = document.querySelector('.sourcePaneCompactButton') as HTMLElement

0 commit comments

Comments
 (0)