Solving bugs with tooltips.

This commit is contained in:
Zoe Roux 2019-09-03 02:37:47 +02:00
parent d3577a581e
commit 71920147b2
6 changed files with 43 additions and 26 deletions

View File

@ -1243,6 +1243,16 @@
"semver-intersect": "1.4.0" "semver-intersect": "1.4.0"
} }
}, },
"@types/bootstrap": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/@types/bootstrap/-/bootstrap-4.3.1.tgz",
"integrity": "sha512-n7Zv7Y+C98Yv4oqbyqGn3alCvNRCya2xMYzOdVEnmnFlu04MXQk1ntVrBhXzDkiwhZZYNkNfBZn2yhTnEh/mHQ==",
"dev": true,
"requires": {
"@types/jquery": "*",
"popper.js": "^1.14.1"
}
},
"@types/events": { "@types/events": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz",
@ -1279,6 +1289,7 @@
"version": "3.3.31", "version": "3.3.31",
"resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.31.tgz", "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.3.31.tgz",
"integrity": "sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==", "integrity": "sha512-Lz4BAJihoFw5nRzKvg4nawXPzutkv7wmfQ5121avptaSIXlDNJCUuxZxX/G+9EVidZGuO0UBlk+YjKbwRKJigg==",
"dev": true,
"requires": { "requires": {
"@types/sizzle": "*" "@types/sizzle": "*"
} }
@ -1310,7 +1321,8 @@
"@types/sizzle": { "@types/sizzle": {
"version": "2.3.2", "version": "2.3.2",
"resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz", "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.2.tgz",
"integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==" "integrity": "sha512-7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg==",
"dev": true
}, },
"@types/source-list-map": { "@types/source-list-map": {
"version": "0.1.2", "version": "0.1.2",

View File

@ -21,7 +21,6 @@
"@angular/platform-browser": "~8.2.0", "@angular/platform-browser": "~8.2.0",
"@angular/platform-browser-dynamic": "~8.2.0", "@angular/platform-browser-dynamic": "~8.2.0",
"@angular/router": "~8.2.0", "@angular/router": "~8.2.0",
"@types/jquery": "^3.3.31",
"bootstrap": "^4.3.1", "bootstrap": "^4.3.1",
"jquery": "^3.4.1", "jquery": "^3.4.1",
"popper.js": "^1.15.0", "popper.js": "^1.15.0",
@ -34,9 +33,11 @@
"@angular/cli": "~8.2.1", "@angular/cli": "~8.2.1",
"@angular/compiler-cli": "~8.2.0", "@angular/compiler-cli": "~8.2.0",
"@angular/language-service": "~8.2.0", "@angular/language-service": "~8.2.0",
"@types/node": "~8.9.4", "@types/bootstrap": "^4.3.1",
"@types/jasmine": "~3.3.8", "@types/jasmine": "~3.3.8",
"@types/jasminewd2": "~2.0.3", "@types/jasminewd2": "~2.0.3",
"@types/jquery": "^3.3.31",
"@types/node": "~8.9.4",
"codelyzer": "^5.0.0", "codelyzer": "^5.0.0",
"jasmine-core": "~3.4.0", "jasmine-core": "~3.4.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",

View File

@ -1,6 +1,8 @@
import { Component } from '@angular/core'; import { Component } from '@angular/core';
import { HttpClient } from '@angular/common/http'; import { HttpClient } from '@angular/common/http';
import { Event, Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router'; import { Event, Router, NavigationStart, NavigationEnd, NavigationCancel, NavigationError } from '@angular/router';
import * as $ from "jquery";
import "bootstrap";
@Component({ @Component({
selector: 'app-root', selector: 'app-root',
@ -24,29 +26,30 @@ export class AppComponent
switch (true) switch (true)
{ {
case event instanceof NavigationStart: case event instanceof NavigationStart:
{ {
this.isLoading = true; this.isLoading = true;
break; break;
} }
case event instanceof NavigationEnd: case event instanceof NavigationEnd:
case event instanceof NavigationCancel: case event instanceof NavigationCancel:
case event instanceof NavigationError: case event instanceof NavigationError:
{ {
this.isLoading = false; this.isLoading = false;
break; break;
} }
default: default:
{ {
break; this.isLoading = false;
} break;
}
} }
}); });
}
$(document).ready(function () ngAfterViewInit()
{ {
$('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="tooltip"]').tooltip();
});
} }
} }

View File

@ -21,11 +21,11 @@ export class BrowseComponent implements OnInit
ngOnInit() ngOnInit()
{ {
this.shows = this.route.snapshot.data.shows; this.shows = this.route.snapshot.data.shows;
}
$(document).ready(function () ngAfterViewInit()
{ {
$('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="tooltip"]').tooltip();
});
} }
getThumb(slug: string) getThumb(slug: string)

View File

@ -44,11 +44,11 @@ export class ShowDetailsComponent implements OnInit
this.toolbar.setAttribute("style", `background-color: rgba(0, 0, 0, 0) !important`); this.toolbar.setAttribute("style", `background-color: rgba(0, 0, 0, 0) !important`);
this.getEpisodes(); this.getEpisodes();
}
$(document).ready(function () ngAfterViewInit()
{ {
$('[data-toggle="tooltip"]').tooltip(); $('[data-toggle="tooltip"]').tooltip();
});
} }
ngOnDestroy() ngOnDestroy()

View File

@ -11,6 +11,7 @@
"moduleResolution": "node", "moduleResolution": "node",
"importHelpers": true, "importHelpers": true,
"target": "es2015", "target": "es2015",
"types": [ "jquery" ],
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"
], ],