From 1829c2cab9e676267864770633a43c0c04a57dca Mon Sep 17 00:00:00 2001 From: Eduard Urbach Date: Wed, 10 Oct 2018 17:42:23 +0900 Subject: [PATCH] Fixed most of TypeScript errors for TS 3.1.2 --- scripts/Actions/Search.ts | 2 +- scripts/Analytics.ts | 8 ++- scripts/AnimeNotifier.ts | 3 +- scripts/Application.ts | 8 +-- scripts/Types/WebSpeechAPI.d.ts | 96 ---------------------------- scripts/Utils/requestIdleCallback.ts | 3 +- 6 files changed, 14 insertions(+), 106 deletions(-) delete mode 100644 scripts/Types/WebSpeechAPI.d.ts diff --git a/scripts/Actions/Search.ts b/scripts/Actions/Search.ts index 529cf4e5..b5dd6491 100644 --- a/scripts/Actions/Search.ts +++ b/scripts/Actions/Search.ts @@ -195,7 +195,7 @@ export function searchBySpeech(arn: AnimeNotifier, element: HTMLElement) { let searchInput = document.getElementById("search") as HTMLInputElement let oldPlaceholder = searchInput.placeholder - let SpeechRecognition: SpeechRecognitionStatic = window["SpeechRecognition"] || window["webkitSpeechRecognition"] + let SpeechRecognition: any = window["SpeechRecognition"] || window["webkitSpeechRecognition"] recognition = new SpeechRecognition() recognition.continuous = false recognition.interimResults = false diff --git a/scripts/Analytics.ts b/scripts/Analytics.ts index 51e01122..40b02154 100644 --- a/scripts/Analytics.ts +++ b/scripts/Analytics.ts @@ -23,10 +23,12 @@ export default class Analytics { } if("connection" in navigator) { + let connection = navigator["connection"] as any + analytics.connection = { - downLink: navigator["connection"].downlink, - roundTripTime: navigator["connection"].rtt, - effectiveType: navigator["connection"].effectiveType + downLink: connection.downlink, + roundTripTime: connection.rtt, + effectiveType: connection.effectiveType } } diff --git a/scripts/AnimeNotifier.ts b/scripts/AnimeNotifier.ts index ec86f409..85fe0305 100644 --- a/scripts/AnimeNotifier.ts +++ b/scripts/AnimeNotifier.ts @@ -1019,7 +1019,8 @@ export default class AnimeNotifier { // Disallow Enter key in contenteditables and make it blur the element instead if(e.keyCode === 13) { if("blur" in activeElement) { - activeElement["blur"]() + let blur = activeElement["blur"] as Function + blur() } return preventDefault() diff --git a/scripts/Application.ts b/scripts/Application.ts index 054f5c54..cd8779a3 100644 --- a/scripts/Application.ts +++ b/scripts/Application.ts @@ -193,7 +193,7 @@ export default class Application { this.content.innerHTML = html } - markActiveLinks(links?: NodeListOf) { + markActiveLinks(links?: HTMLCollectionOf) { if(!links) { links = document.getElementsByTagName("a") } @@ -211,7 +211,7 @@ export default class Application { } } - ajaxify(links?: NodeListOf) { + ajaxify(links?: HTMLCollectionOf) { if(!links) { links = document.getElementsByTagName("a") } @@ -241,10 +241,10 @@ export default class Application { return } - let url = this.getAttribute("href") - e.preventDefault() + let url = (this as HTMLAnchorElement).getAttribute("href") + if(!url || url === self.currentPath) { return } diff --git a/scripts/Types/WebSpeechAPI.d.ts b/scripts/Types/WebSpeechAPI.d.ts deleted file mode 100644 index a7aae159..00000000 --- a/scripts/Types/WebSpeechAPI.d.ts +++ /dev/null @@ -1,96 +0,0 @@ -// Type definitions for Web Speech API -// Project: https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html -// Definitions by: SaschaNaz -// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped -// TypeScript Version: 2.2 - -// Spec version: 19 October 2012 -// Errata version: 6 June 2014 -// Corrected unofficial spec version: 6 June 2014 - -interface SpeechRecognition extends EventTarget { - grammars: SpeechGrammarList; - lang: string; - continuous: boolean; - interimResults: boolean; - maxAlternatives: number; - serviceURI: string; - - start(): void; - stop(): void; - abort(): void; - - onaudiostart: (ev: Event) => any; - onsoundstart: (ev: Event) => any; - onspeechstart: (ev: Event) => any; - onspeechend: (ev: Event) => any; - onsoundend: (ev: Event) => any; - onaudioend: (ev: Event) => any; - onresult: (ev: SpeechRecognitionEvent) => any; - onnomatch: (ev: SpeechRecognitionEvent) => any; - onerror: (ev: SpeechRecognitionError) => any; - onstart: (ev: Event) => any; - onend: (ev: Event) => any; -} -interface SpeechRecognitionStatic { - prototype: SpeechRecognition; - new (): SpeechRecognition; -} -declare var SpeechRecognition: SpeechRecognitionStatic; -declare var webkitSpeechRecognition: SpeechRecognitionStatic; - -interface SpeechRecognitionError extends Event { - error: string; - message: string; -} - -interface SpeechRecognitionAlternative { - transcript: string; - confidence: number; -} - -interface SpeechRecognitionResult { - length: number; - item(index: number): SpeechRecognitionAlternative; - [index: number]: SpeechRecognitionAlternative; - /* Errata 02 */ - isFinal: boolean; -} - -interface SpeechRecognitionResultList { - length: number; - item(index: number): SpeechRecognitionResult; - [index: number]: SpeechRecognitionResult; -} - -interface SpeechRecognitionEvent extends Event { - resultIndex: number; - results: SpeechRecognitionResultList; - interpretation: any; - emma: Document; -} - -interface SpeechGrammar { - src: string; - weight: number; -} -interface SpeechGrammarStatic { - prototype: SpeechGrammar; - new (): SpeechGrammar; -} -declare var SpeechGrammar: SpeechGrammarStatic; -declare var webkitSpeechGrammar: SpeechGrammarStatic; - -interface SpeechGrammarList { - length: number; - item(index: number): SpeechGrammar; - [index: number]: SpeechGrammar; - addFromURI(src: string, weight: number): void; - addFromString(string: string, weight: number): void; -} -interface SpeechGrammarListStatic { - prototype: SpeechGrammarList; - new (): SpeechGrammarList; -} -declare var SpeechGrammarList: SpeechGrammarListStatic; -declare var webkitSpeechGrammarList: SpeechGrammarListStatic; diff --git a/scripts/Utils/requestIdleCallback.ts b/scripts/Utils/requestIdleCallback.ts index 5b2997f6..0ecbe5f5 100644 --- a/scripts/Utils/requestIdleCallback.ts +++ b/scripts/Utils/requestIdleCallback.ts @@ -1,6 +1,7 @@ export function requestIdleCallback(func: Function) { if("requestIdleCallback" in window) { - window["requestIdleCallback"](func) + let requestIdleCallback = window["requestIdleCallback"] as Function + requestIdleCallback(func) } else { func() }