mirror of
https://github.com/ajurna/cbwebreader.git
synced 2026-11-02 10:36:55 +00:00
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
24c12e19be |
No files matched your search
@@ -46,29 +46,6 @@
|
|||||||
@nextComic="nextComic"
|
@nextComic="nextComic"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div class="col-auto">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="btn btn-sm btn-outline-secondary"
|
|
||||||
:class="{ active: show_shortcuts }"
|
|
||||||
:aria-pressed="show_shortcuts ? 'true' : 'false'"
|
|
||||||
@click="show_shortcuts = !show_shortcuts"
|
|
||||||
>?</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="shortcuts" v-if="show_shortcuts" role="dialog" aria-label="Keyboard shortcuts">
|
|
||||||
<div class="shortcuts-head">
|
|
||||||
<strong>Keyboard shortcuts</strong>
|
|
||||||
<button type="button" class="btn btn-sm btn-outline-secondary" @click="show_shortcuts = false">Close</button>
|
|
||||||
</div>
|
|
||||||
<table>
|
|
||||||
<tbody>
|
|
||||||
<tr v-for="shortcut in shortcuts" :key="shortcut.keys">
|
|
||||||
<td><kbd>{{ shortcut.keys }}</kbd></td>
|
|
||||||
<td>{{ shortcut.action }}</td>
|
|
||||||
</tr>
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</template>
|
</template>
|
||||||
@@ -107,18 +84,6 @@ export default {
|
|||||||
save_timeout: null,
|
save_timeout: null,
|
||||||
key_locked: false,
|
key_locked: false,
|
||||||
key_timeout: null,
|
key_timeout: null,
|
||||||
show_shortcuts: false,
|
|
||||||
shortcuts: [
|
|
||||||
{ keys: '← / →', action: 'Previous / next page' },
|
|
||||||
{ keys: '↑ / ↓', action: 'Scroll within the page' },
|
|
||||||
{ keys: 'Space', action: 'Next page' },
|
|
||||||
{ keys: 'Shift + Space', action: 'Previous page' },
|
|
||||||
{ keys: 'n / p', action: 'Next / previous page' },
|
|
||||||
{ keys: 'Home / End', action: 'First / last page' },
|
|
||||||
{ keys: 'm', action: 'Switch reading mode' },
|
|
||||||
{ keys: '?', action: 'Show or hide this list' },
|
|
||||||
{ keys: 'Esc', action: 'Hide this list' },
|
|
||||||
],
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
props: {
|
props: {
|
||||||
@@ -216,10 +181,6 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!this.deck) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
this.current_page = pageNum-1
|
this.current_page = pageNum-1
|
||||||
this.deck.slide(this.current_page)
|
this.deck.slide(this.current_page)
|
||||||
},
|
},
|
||||||
@@ -236,17 +197,6 @@ export default {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// These only show or hide the shortcut list, so they still work when a control
|
|
||||||
// has focus.
|
|
||||||
if (e.key === 'Escape') {
|
|
||||||
this.show_shortcuts = false
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if (e.key === '?') {
|
|
||||||
this.show_shortcuts = !this.show_shortcuts
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// The reader listens on window, so a key pressed while a control has focus would
|
// The reader listens on window, so a key pressed while a control has focus would
|
||||||
// otherwise page as well as activate that control.
|
// otherwise page as well as activate that control.
|
||||||
if (e.target && e.target.closest && e.target.closest('input, select, textarea, button')) {
|
if (e.target && e.target.closest && e.target.closest('input, select, textarea, button')) {
|
||||||
@@ -263,34 +213,10 @@ export default {
|
|||||||
// scrolling: the page is taller than the viewport, and intercepting them here would
|
// scrolling: the page is taller than the viewport, and intercepting them here would
|
||||||
// double up with the native scroll. In continuous mode the observer records whichever
|
// double up with the native scroll. In continuous mode the observer records whichever
|
||||||
// page is topmost, so scrolling inside a page does not change the saved page.
|
// page is topmost, so scrolling inside a page does not change the saved page.
|
||||||
const key = e.key.toLowerCase()
|
if (e.key === 'ArrowRight') {
|
||||||
switch (key) {
|
this.nextPage('auto')
|
||||||
case 'arrowright':
|
} else if (e.key === 'ArrowLeft') {
|
||||||
case 'n':
|
this.prevPage('auto')
|
||||||
this.nextPage('auto')
|
|
||||||
return
|
|
||||||
case 'arrowleft':
|
|
||||||
case 'p':
|
|
||||||
this.prevPage('auto')
|
|
||||||
return
|
|
||||||
case ' ':
|
|
||||||
// Space would otherwise scroll the page as well as turning it.
|
|
||||||
e.preventDefault?.()
|
|
||||||
if (e.shiftKey) {
|
|
||||||
this.prevPage('auto')
|
|
||||||
} else {
|
|
||||||
this.nextPage('auto')
|
|
||||||
}
|
|
||||||
return
|
|
||||||
case 'home':
|
|
||||||
case 'end':
|
|
||||||
// Same for Home/End, which the browser would scroll to the page edges.
|
|
||||||
e.preventDefault?.()
|
|
||||||
this.setPage(key === 'home' ? 1 : this.pages)
|
|
||||||
return
|
|
||||||
case 'm':
|
|
||||||
this.setMode(this.mode === 'paged' ? 'scroll' : 'paged')
|
|
||||||
return
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
// Continuous mode: reveal is not used for visibility here, so the page in view is
|
// Continuous mode: reveal is not used for visibility here, so the page in view is
|
||||||
@@ -489,36 +415,6 @@ section {
|
|||||||
padding-bottom: 60px;
|
padding-bottom: 60px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.shortcuts {
|
|
||||||
position: fixed;
|
|
||||||
right: 12px;
|
|
||||||
bottom: 64px;
|
|
||||||
max-width: 340px;
|
|
||||||
padding: 10px 12px;
|
|
||||||
border: 1px solid #adb5bd;
|
|
||||||
border-radius: 6px;
|
|
||||||
background: rgba(255, 255, 255, 0.95);
|
|
||||||
font-size: 0.85rem;
|
|
||||||
z-index: 20;
|
|
||||||
}
|
|
||||||
|
|
||||||
.shortcuts-head {
|
|
||||||
display: flex;
|
|
||||||
justify-content: space-between;
|
|
||||||
align-items: center;
|
|
||||||
margin-bottom: 6px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.shortcuts td {
|
|
||||||
padding: 2px 8px 2px 0;
|
|
||||||
vertical-align: top;
|
|
||||||
}
|
|
||||||
|
|
||||||
.shortcuts kbd {
|
|
||||||
font-family: inherit;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* reveal.css is deliberately not loaded, so visibility is the `hidden` attribute and
|
/* reveal.css is deliberately not loaded, so visibility is the `hidden` attribute and
|
||||||
reveal's own transition classes do nothing. A transition cannot run across
|
reveal's own transition classes do nothing. A transition cannot run across
|
||||||
display:none -> block, so paged mode uses an animation on the slide that becomes
|
display:none -> block, so paged mode uses an animation on the slide that becomes
|
||||||
|
|||||||
@@ -231,98 +231,6 @@ describe('TheComicReader', () => {
|
|||||||
expect(api.put).not.toHaveBeenCalled()
|
expect(api.put).not.toHaveBeenCalled()
|
||||||
})
|
})
|
||||||
|
|
||||||
it('shows the shortcut list with ? and hides it again', async () => {
|
|
||||||
const wrapper = mountReader()
|
|
||||||
await flushPromises()
|
|
||||||
|
|
||||||
expect(wrapper.find('.shortcuts').exists()).toBe(false)
|
|
||||||
|
|
||||||
wrapper.vm.keyPress({ key: '?' })
|
|
||||||
await flushPromises()
|
|
||||||
expect(wrapper.find('.shortcuts').exists()).toBe(true)
|
|
||||||
|
|
||||||
wrapper.vm.keyPress({ key: '?' })
|
|
||||||
await flushPromises()
|
|
||||||
expect(wrapper.find('.shortcuts').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('hides the shortcut list with Escape even when a control has focus', async () => {
|
|
||||||
const wrapper = mountReader()
|
|
||||||
await flushPromises()
|
|
||||||
|
|
||||||
wrapper.vm.keyPress({ key: '?' })
|
|
||||||
await flushPromises()
|
|
||||||
expect(wrapper.find('.shortcuts').exists()).toBe(true)
|
|
||||||
|
|
||||||
wrapper.vm.keyPress({ key: 'Escape', target: document.createElement('input') })
|
|
||||||
await flushPromises()
|
|
||||||
expect(wrapper.find('.shortcuts').exists()).toBe(false)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('toggles the shortcut list from the ? button', async () => {
|
|
||||||
const wrapper = mountReader()
|
|
||||||
await flushPromises()
|
|
||||||
|
|
||||||
const button = wrapper.find('button[aria-pressed]')
|
|
||||||
await button.trigger('click')
|
|
||||||
expect(wrapper.find('.shortcuts').exists()).toBe(true)
|
|
||||||
expect(button.attributes('aria-pressed')).toBe('true')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('pages with Space and Shift+Space', async () => {
|
|
||||||
const wrapper = mountReader()
|
|
||||||
await flushPromises()
|
|
||||||
deck.slide.mockClear()
|
|
||||||
|
|
||||||
const preventDefault = vi.fn()
|
|
||||||
wrapper.vm.keyPress({ key: ' ', preventDefault })
|
|
||||||
expect(preventDefault).toHaveBeenCalled()
|
|
||||||
expect(deck.slide).toHaveBeenCalledWith(3)
|
|
||||||
|
|
||||||
vi.advanceTimersByTime(100)
|
|
||||||
wrapper.vm.keyPress({ key: ' ', shiftKey: true, preventDefault })
|
|
||||||
expect(deck.slide).toHaveBeenCalledWith(2)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('pages with n and p whatever the case', async () => {
|
|
||||||
const wrapper = mountReader()
|
|
||||||
await flushPromises()
|
|
||||||
deck.slide.mockClear()
|
|
||||||
|
|
||||||
wrapper.vm.keyPress({ key: 'n' })
|
|
||||||
expect(deck.slide).toHaveBeenCalledWith(3)
|
|
||||||
|
|
||||||
vi.advanceTimersByTime(100)
|
|
||||||
wrapper.vm.keyPress({ key: 'P' })
|
|
||||||
expect(deck.slide).toHaveBeenCalledWith(2)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('jumps to the first and last page with Home and End', async () => {
|
|
||||||
const wrapper = mountReader()
|
|
||||||
await flushPromises()
|
|
||||||
deck.slide.mockClear()
|
|
||||||
|
|
||||||
const preventDefault = vi.fn()
|
|
||||||
wrapper.vm.keyPress({ key: 'Home', preventDefault })
|
|
||||||
expect(preventDefault).toHaveBeenCalled()
|
|
||||||
expect(deck.slide).toHaveBeenCalledWith(0)
|
|
||||||
|
|
||||||
vi.advanceTimersByTime(100)
|
|
||||||
wrapper.vm.keyPress({ key: 'End', preventDefault })
|
|
||||||
expect(deck.slide).toHaveBeenCalledWith(4)
|
|
||||||
})
|
|
||||||
|
|
||||||
it('switches reading mode with m', async () => {
|
|
||||||
const wrapper = mountReader()
|
|
||||||
await flushPromises()
|
|
||||||
|
|
||||||
wrapper.vm.keyPress({ key: 'm' })
|
|
||||||
await flushPromises()
|
|
||||||
|
|
||||||
expect(store.commit).toHaveBeenCalledWith('setReaderMode', 'scroll')
|
|
||||||
expect(wrapper.vm.mode).toBe('scroll')
|
|
||||||
})
|
|
||||||
|
|
||||||
it('shows the top of the page when changing pages in paged mode', async () => {
|
it('shows the top of the page when changing pages in paged mode', async () => {
|
||||||
const wrapper = mountReader()
|
const wrapper = mountReader()
|
||||||
await flushPromises()
|
await flushPromises()
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
version = 1
|
version = 1
|
||||||
revision = 5
|
revision = 3
|
||||||
requires-python = ">=3.14"
|
requires-python = ">=3.14"
|
||||||
resolution-markers = [
|
resolution-markers = [
|
||||||
"python_full_version >= '3.15'",
|
"python_full_version >= '3.15'",
|
||||||
@@ -1068,11 +1068,11 @@ wheels = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pyjwt"
|
name = "pyjwt"
|
||||||
version = "2.10.1"
|
version = "2.15.0"
|
||||||
source = { registry = "https://pypi.org/simple" }
|
source = { registry = "https://pypi.org/simple" }
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/e7/46/bd74733ff231675599650d3e47f361794b22ef3e3770998dda30d3b63726/pyjwt-2.10.1.tar.gz", hash = "sha256:3cc5772eb20009233caf06e9d8a0577824723b44e6648ee0a2aedb6cf9381953", size = 87785, upload-time = "2024-11-28T03:43:29.933Z" }
|
sdist = { url = "https://files.pythonhosted.org/packages/02/a5/5197bfd06417837ac079921c66fa6393f1dea3557272a263cebfef69e432/pyjwt-2.15.0.tar.gz", hash = "sha256:b11c5f9791d7bf51c2b39a81ed669f6b2dbbd669df2942f6c60167e9e3d1abe4", size = 120513, upload-time = "2026-09-23T16:56:00.689Z" }
|
||||||
wheels = [
|
wheels = [
|
||||||
{ url = "https://files.pythonhosted.org/packages/61/ad/689f02752eeec26aed679477e80e632ef1b682313be70793d798c1d5fc8f/PyJWT-2.10.1-py3-none-any.whl", hash = "sha256:dcdd193e30abefd5debf142f9adfcdd2b58004e644f25406ffaebd50bd98dacb", size = 22997, upload-time = "2024-11-28T03:43:27.893Z" },
|
{ url = "https://files.pythonhosted.org/packages/e8/55/40e45bf052ee8ee12a4dfd785519660f8effa7b065442b91646ec6828619/pyjwt-2.15.0-py3-none-any.whl", hash = "sha256:7a3742debf6b879e912dbb9819ceec1594be812452b78c5f2e2dfc56564954f8", size = 33680, upload-time = "2026-09-23T16:55:59.241Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
Reference in new issue
Block a user