web/notify.moe
Code Issues Pull Requests Activity

Re-activate search when pressing Enter

Browse Source
This commit is contained in:
Eduard Urbach 2018-03-22 01:32:04 +01:00
parent 5a62c3ce59
commit 8fa4d1b941
2 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/Actions/Search.ts
View File

@ -30,18 +30,18 @@ export async function search(arn: AnimeNotifier, search: HTMLInputElement, e: Ke
return return
} }
// Determine if we're already seeing the search page
let searchPageActivated = (searchPage === arn.app.content.children[0])
// Check if the search term really changed // Check if the search term really changed
let term = search.value.trim() let term = search.value.trim()
if(term === oldTerm) { if(term === oldTerm && searchPageActivated) {
return return
} }
oldTerm = term oldTerm = term
// Determine if we're already seeing the search page
let searchPageActivated = (searchPage === arn.app.content.children[0])
// Reset // Reset
correctResponseRendered.anime = false correctResponseRendered.anime = false
correctResponseRendered.character = false correctResponseRendered.character = false

27
scripts/AnimeNotifier.ts
View File

@ -12,7 +12,7 @@ import { ServiceWorkerManager } from "./ServiceWorkerManager"
import { displayAiringDate, displayDate, displayTime } from "./DateView" import { displayAiringDate, displayDate, displayTime } from "./DateView"
import { findAll, delay, canUseWebP, swapElements } from "./Utils" import { findAll, delay, canUseWebP, swapElements } from "./Utils"
import * as actions from "./Actions" import * as actions from "./Actions"
import { darkTheme, addSpeed, playPreviousTrack } from "./Actions"; import { darkTheme, addSpeed, playPreviousTrack, search } from "./Actions";
import { playPauseAudio, playNextTrack } from "./Actions/Audio" import { playPauseAudio, playNextTrack } from "./Actions/Audio"
export class AnimeNotifier { export class AnimeNotifier {
@ -880,6 +880,13 @@ export class AnimeNotifier {
// Ignore hotkeys on input elements // Ignore hotkeys on input elements
switch(activeElement.tagName) { switch(activeElement.tagName) {
case "INPUT": case "INPUT":
//
if(activeElement.id === "search" && e.keyCode === 13) {
search(this, activeElement as HTMLInputElement, e)
}
return
case "TEXTAREA": case "TEXTAREA":
return return
} }
@ -887,7 +894,7 @@ export class AnimeNotifier {
// Ignore hotkeys on contentEditable elements // Ignore hotkeys on contentEditable elements
if(activeElement.getAttribute("contenteditable") === "true") { if(activeElement.getAttribute("contenteditable") === "true") {
// Disallow Enter key in contenteditables and make it blur the element instead // Disallow Enter key in contenteditables and make it blur the element instead
if(e.keyCode == 13) { if(e.keyCode === 13) {
if("blur" in activeElement) { if("blur" in activeElement) {
activeElement["blur"]() activeElement["blur"]()
} }
@ -900,7 +907,7 @@ export class AnimeNotifier {
} }
// "Ctrl" + "," = Settings // "Ctrl" + "," = Settings
if(e.ctrlKey && e.keyCode == 188) { if(e.ctrlKey && e.keyCode === 188) {
this.app.load("/settings") this.app.load("/settings")
e.preventDefault() e.preventDefault()
@ -914,7 +921,7 @@ export class AnimeNotifier {
} }
// "F" = Search // "F" = Search
if(e.keyCode == 70) { if(e.keyCode === 70) {
let search = this.app.find("search") as HTMLInputElement let search = this.app.find("search") as HTMLInputElement
search.focus() search.focus()
@ -926,7 +933,7 @@ export class AnimeNotifier {
} }
// "S" = Toggle sidebar // "S" = Toggle sidebar
if(e.keyCode == 83) { if(e.keyCode === 83) {
this.sideBar.toggle() this.sideBar.toggle()
e.preventDefault() e.preventDefault()
@ -935,7 +942,7 @@ export class AnimeNotifier {
} }
// "+" = Audio speed up // "+" = Audio speed up
if(e.keyCode == 107 || e.keyCode == 187) { if(e.keyCode === 107 || e.keyCode === 187) {
addSpeed(this, 0.05) addSpeed(this, 0.05)
e.preventDefault() e.preventDefault()
@ -944,7 +951,7 @@ export class AnimeNotifier {
} }
// "-" = Audio speed down // "-" = Audio speed down
if(e.keyCode == 109 || e.keyCode == 189) { if(e.keyCode === 109 || e.keyCode === 189) {
addSpeed(this, -0.05) addSpeed(this, -0.05)
e.preventDefault() e.preventDefault()
@ -953,7 +960,7 @@ export class AnimeNotifier {
} }
// "J" = Previous track // "J" = Previous track
if(e.keyCode == 74) { if(e.keyCode === 74) {
playPreviousTrack(this) playPreviousTrack(this)
e.preventDefault() e.preventDefault()
@ -962,7 +969,7 @@ export class AnimeNotifier {
} }
// "K" = Play/pause // "K" = Play/pause
if(e.keyCode == 75) { if(e.keyCode === 75) {
playPauseAudio(this) playPauseAudio(this)
e.preventDefault() e.preventDefault()
@ -971,7 +978,7 @@ export class AnimeNotifier {
} }
// "L" = Next track // "L" = Next track
if(e.keyCode == 76) { if(e.keyCode === 76) {
playNextTrack(this) playNextTrack(this)
e.preventDefault() e.preventDefault()