From 725c6c4b886606499dee2a34eccc68355739f9e2 Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Sat, 5 Oct 2019 23:04:36 +0200 Subject: [PATCH] Changing tooltip toogle value. --- Kyoo/ClientApp/src/app/app.component.ts | 3 +-- Kyoo/ClientApp/src/app/browse/browse.component.ts | 5 ----- .../ClientApp/src/app/player/player.component.html | 4 ++-- Kyoo/ClientApp/src/app/player/player.component.ts | 14 +++++++------- .../src/app/show-details/show-details.component.ts | 5 ----- 5 files changed, 10 insertions(+), 21 deletions(-) diff --git a/Kyoo/ClientApp/src/app/app.component.ts b/Kyoo/ClientApp/src/app/app.component.ts index e92a2c7f..3cf0e54d 100644 --- a/Kyoo/ClientApp/src/app/app.component.ts +++ b/Kyoo/ClientApp/src/app/app.component.ts @@ -1,8 +1,7 @@ import { Component } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Event, Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router'; -//import * as $ from "jquery"; -//import "bootstrap"; +import * as $ from "jquery"; @Component({ selector: 'app-root', diff --git a/Kyoo/ClientApp/src/app/browse/browse.component.ts b/Kyoo/ClientApp/src/app/browse/browse.component.ts index 40507218..3399b521 100644 --- a/Kyoo/ClientApp/src/app/browse/browse.component.ts +++ b/Kyoo/ClientApp/src/app/browse/browse.component.ts @@ -23,11 +23,6 @@ export class BrowseComponent implements OnInit this.shows = this.route.snapshot.data.shows; } - ngAfterViewInit() - { - $('[data-toggle="tooltip"]').tooltip({ trigger: "hover" }); - } - getThumb(slug: string) { return this.sanitizer.bypassSecurityTrustStyle("url(/poster/" + slug + ")"); diff --git a/Kyoo/ClientApp/src/app/player/player.component.html b/Kyoo/ClientApp/src/app/player/player.component.html index 4f3a8ae6..5a9c368e 100644 --- a/Kyoo/ClientApp/src/app/player/player.component.html +++ b/Kyoo/ClientApp/src/app/player/player.component.html @@ -38,7 +38,7 @@ skip_previous - @@ -77,7 +77,7 @@ - diff --git a/Kyoo/ClientApp/src/app/player/player.component.ts b/Kyoo/ClientApp/src/app/player/player.component.ts index 2a58ee0f..52d72c27 100644 --- a/Kyoo/ClientApp/src/app/player/player.component.ts +++ b/Kyoo/ClientApp/src/app/player/player.component.ts @@ -34,6 +34,9 @@ export class PlayerComponent implements OnInit volumeIcon: string = "volume_up"; //Icon used by the volume btn. fullscreenIcon: string = "fullscreen"; //Icon used by the fullscreen btn. + playTooltip: string = "Pause"; //Text used in the play tooltip + fullscreenTooltip: string = "Fullscreen"; //Text used in the fullscreen tooltip + private player: HTMLVideoElement; private thumb: HTMLElement; private progress: HTMLElement; @@ -83,7 +86,7 @@ export class PlayerComponent implements OnInit this.player.onpause = () => { this.playIcon = "play_arrow" - $("#play").attr("data-original-title", "Play"); + this.playTooltip = "Play"; } this.player.ontimeupdate = () => @@ -194,12 +197,12 @@ export class PlayerComponent implements OnInit if (document.fullscreenElement != null) { this.fullscreenIcon = "fullscreen_exit"; - $("#fullscreen").attr("data-original-title", "Exit fullscreen"); + this.fullscreenTooltip = "Exit fullscreen"; } else { this.fullscreenIcon = "fullscreen"; - $("#fullscreen").attr("data-original-title", "Fullscreen"); + this.fullscreenTooltip = "Fullscreen"; } }); @@ -271,8 +274,6 @@ export class PlayerComponent implements OnInit } }); - $('[data-toggle="tooltip"]').tooltip({ trigger: "hover" }); - this.init(); } @@ -328,7 +329,6 @@ export class PlayerComponent implements OnInit $(document).unbind(); $(window).unbind(); - $('[data-toggle="tooltip"]').hide(); } tooglePlayback() @@ -352,7 +352,7 @@ export class PlayerComponent implements OnInit initPlayBtn() { this.playIcon = "pause"; - $("#play").attr("data-original-title", "Pause"); + this.playTooltip = "Pause"; } fullscreen() diff --git a/Kyoo/ClientApp/src/app/show-details/show-details.component.ts b/Kyoo/ClientApp/src/app/show-details/show-details.component.ts index 4bae1fea..a26b3f8f 100644 --- a/Kyoo/ClientApp/src/app/show-details/show-details.component.ts +++ b/Kyoo/ClientApp/src/app/show-details/show-details.component.ts @@ -46,11 +46,6 @@ export class ShowDetailsComponent implements OnInit this.getEpisodes(); } - ngAfterViewInit() - { - $('[data-toggle="tooltip"]').tooltip({ trigger: "hover" }); - } - ngOnDestroy() { window.removeEventListener("scroll", this.scroll, true);