diff --git a/src/app/modules/about/about-changelog.html b/src/app/modules/about/about-changelog.html index 7161d702..fae21138 100644 --- a/src/app/modules/about/about-changelog.html +++ b/src/app/modules/about/about-changelog.html @@ -16,10 +16,7 @@ - + Changelog diff --git a/src/app/modules/about/about-licenses.html b/src/app/modules/about/about-licenses.html index 6e71a7b4..acae245b 100644 --- a/src/app/modules/about/about-licenses.html +++ b/src/app/modules/about/about-licenses.html @@ -16,10 +16,7 @@ - + Licenses diff --git a/src/app/modules/about/about-page/about-page.html b/src/app/modules/about/about-page/about-page.html index f84f2da6..e1007119 100644 --- a/src/app/modules/about/about-page/about-page.html +++ b/src/app/modules/about/about-page/about-page.html @@ -16,10 +16,7 @@ - + {{ 'title' | translateSimple: content diff --git a/src/app/modules/assessments/detail/assessments-detail.html b/src/app/modules/assessments/detail/assessments-detail.html index 49a6103a..1ae59538 100644 --- a/src/app/modules/assessments/detail/assessments-detail.html +++ b/src/app/modules/assessments/detail/assessments-detail.html @@ -15,10 +15,7 @@ - + {{ 'data.detail.TITLE' | translate }} diff --git a/src/app/modules/assessments/page/assessments-page.html b/src/app/modules/assessments/page/assessments-page.html index f349c1ce..49ce639a 100644 --- a/src/app/modules/assessments/page/assessments-page.html +++ b/src/app/modules/assessments/page/assessments-page.html @@ -1,10 +1,7 @@ - + {{ 'assessments.TITLE' | translate }} diff --git a/src/app/modules/catalog/catalog.component.html b/src/app/modules/catalog/catalog.component.html index 33efdd04..bbf54140 100644 --- a/src/app/modules/catalog/catalog.component.html +++ b/src/app/modules/catalog/catalog.component.html @@ -1,10 +1,7 @@ - + {{ 'catalog.title' | translate | titlecase }} diff --git a/src/app/modules/data/detail/data-detail.html b/src/app/modules/data/detail/data-detail.html index a3a7f1fb..8177f1e6 100644 --- a/src/app/modules/data/detail/data-detail.html +++ b/src/app/modules/data/detail/data-detail.html @@ -16,10 +16,7 @@ - + {{ 'data.detail.TITLE' | translate }} diff --git a/src/app/modules/data/list/search-page.html b/src/app/modules/data/list/search-page.html index f40ce4e0..c23402cd 100644 --- a/src/app/modules/data/list/search-page.html +++ b/src/app/modules/data/list/search-page.html @@ -2,10 +2,7 @@ - + {{ title | translate }} diff --git a/src/app/modules/feedback/feedback-page.html b/src/app/modules/feedback/feedback-page.html index 6594a155..f8f6365e 100644 --- a/src/app/modules/feedback/feedback-page.html +++ b/src/app/modules/feedback/feedback-page.html @@ -1,10 +1,7 @@ - + {{ 'feedback.page.TITLE' | translate }} diff --git a/src/app/modules/hebis/hebis-detail/hebis-detail.html b/src/app/modules/hebis/hebis-detail/hebis-detail.html index 02e1f449..9b969212 100644 --- a/src/app/modules/hebis/hebis-detail/hebis-detail.html +++ b/src/app/modules/hebis/hebis-detail/hebis-detail.html @@ -16,10 +16,7 @@ - + {{ 'data.detail.TITLE' | translate }} diff --git a/src/app/modules/hebis/list/hebis-search-page.html b/src/app/modules/hebis/list/hebis-search-page.html index fc548e71..501941f6 100644 --- a/src/app/modules/hebis/list/hebis-search-page.html +++ b/src/app/modules/hebis/list/hebis-search-page.html @@ -1,10 +1,7 @@ - + {{ 'hebisSearch.title' | translate }} diff --git a/src/app/modules/library/account/account.page.html b/src/app/modules/library/account/account.page.html index 6c46c2f3..ef06ae89 100644 --- a/src/app/modules/library/account/account.page.html +++ b/src/app/modules/library/account/account.page.html @@ -1,10 +1,7 @@ - + {{ 'library.account.title' | translate | titlecase }} diff --git a/src/app/modules/library/account/checked-out/checked-out-page.html b/src/app/modules/library/account/checked-out/checked-out-page.html index 86744fbe..445aa449 100644 --- a/src/app/modules/library/account/checked-out/checked-out-page.html +++ b/src/app/modules/library/account/checked-out/checked-out-page.html @@ -1,10 +1,7 @@ - + {{ 'library.account.pages.checked_out.title' | translate | titlecase diff --git a/src/app/modules/library/account/fines/fines-page.html b/src/app/modules/library/account/fines/fines-page.html index 41e532e1..1ff7e741 100644 --- a/src/app/modules/library/account/fines/fines-page.html +++ b/src/app/modules/library/account/fines/fines-page.html @@ -1,10 +1,7 @@ - + {{ 'library.account.pages.fines.title' | translate | titlecase diff --git a/src/app/modules/library/account/holds-and-reservations/holds-and-reservations-page.html b/src/app/modules/library/account/holds-and-reservations/holds-and-reservations-page.html index 45e6f448..375d7d75 100644 --- a/src/app/modules/library/account/holds-and-reservations/holds-and-reservations-page.html +++ b/src/app/modules/library/account/holds-and-reservations/holds-and-reservations-page.html @@ -1,10 +1,7 @@ - + {{ 'library.account.pages.holds.title' | translate | titlecase diff --git a/src/app/modules/library/account/profile/profile-page.html b/src/app/modules/library/account/profile/profile-page.html index 52674166..8ad9c9df 100644 --- a/src/app/modules/library/account/profile/profile-page.html +++ b/src/app/modules/library/account/profile/profile-page.html @@ -1,10 +1,7 @@ - + {{ 'library.account.pages.profile.title' | translate | titlecase diff --git a/src/app/modules/map/page/map-page.html b/src/app/modules/map/page/map-page.html index 08bd3c99..483c12c7 100644 --- a/src/app/modules/map/page/map-page.html +++ b/src/app/modules/map/page/map-page.html @@ -18,17 +18,7 @@ - - + {{ 'map.page.TITLE' | translate }} diff --git a/src/app/modules/news/page/news-page.html b/src/app/modules/news/page/news-page.html index 3bab7c07..4a7e535a 100644 --- a/src/app/modules/news/page/news-page.html +++ b/src/app/modules/news/page/news-page.html @@ -1,10 +1,7 @@ - + {{ 'news.title' | translate }} diff --git a/src/app/modules/profile/page/profile-page.component.html b/src/app/modules/profile/page/profile-page.component.html index d5eabae3..d7bc8e54 100644 --- a/src/app/modules/profile/page/profile-page.component.html +++ b/src/app/modules/profile/page/profile-page.component.html @@ -1,10 +1,7 @@ - + {{ 'profile.title' | translate | titlecase }} diff --git a/src/app/modules/schedule/page/schedule-page.html b/src/app/modules/schedule/page/schedule-page.html index 8d5b6c38..bfc04ab9 100644 --- a/src/app/modules/schedule/page/schedule-page.html +++ b/src/app/modules/schedule/page/schedule-page.html @@ -16,10 +16,7 @@ - + {{ 'schedule.calendar' | translate | titlecase diff --git a/src/app/modules/settings/page/settings-page.html b/src/app/modules/settings/page/settings-page.html index ca0c6c3f..bfe68778 100644 --- a/src/app/modules/settings/page/settings-page.html +++ b/src/app/modules/settings/page/settings-page.html @@ -1,10 +1,7 @@ - + {{ 'settings.title' | translate | titlecase }} diff --git a/src/app/util/ion-back-button.directive.ts b/src/app/util/ion-back-button.directive.ts deleted file mode 100644 index aca2f7fb..00000000 --- a/src/app/util/ion-back-button.directive.ts +++ /dev/null @@ -1,59 +0,0 @@ -import {Directive, HostListener, Input, Optional} from '@angular/core'; -import { - AnimationBuilder, - Config, - IonBackButtonDelegate, - IonRouterOutlet, - NavController, -} from '@ionic/angular'; - -/** - * Overrides the default ion-back-button directive. - * - * @see https://github.com/ionic-team/ionic-framework/blob/main/angular/src/directives/navigation/ion-back-button.ts - */ -@Directive({ - selector: 'ion-back-button', -}) -export class IonBackButtonOverrideDirective { - @Input() - defaultHref: string | undefined | null; - - @Input() - routerAnimation?: AnimationBuilder; - - constructor( - @Optional() private routerOutlet: IonRouterOutlet, - private navCtrl: NavController, - private config: Config, - private ionBackButton: IonBackButtonDelegate, - ) { - this.ionBackButton.onClick = () => { - // Override default onClick to prevent double execution and errors - }; - } - - @HostListener('click', ['$event']) - onClick(event: Event): void { - const defaultHref = - this.defaultHref || this.config.get('backButtonDefaultHref'); - - // Handle back via angular navCtrl.back() - // (which is animated, instead of location.back) - if (defaultHref === '..') { - this.navCtrl.back(); - } else if (this.routerOutlet?.canGoBack()) { - this.navCtrl.setDirection( - 'back', - undefined, - undefined, - this.routerAnimation, - ); - this.routerOutlet.pop(); - event.preventDefault(); - } else if (defaultHref != undefined) { - this.navCtrl.navigateBack(defaultHref, {animation: this.routerAnimation}); - event.preventDefault(); - } - } -} diff --git a/src/app/util/util.module.ts b/src/app/util/util.module.ts index a357d840..ae9126b4 100644 --- a/src/app/util/util.module.ts +++ b/src/app/util/util.module.ts @@ -21,7 +21,6 @@ import {DateFromIndexPipe} from './date-from-index.pipe'; import {DaytimeKeyPipe} from './daytime-key.pipe'; import {LazyPipe} from './lazy.pipe'; import {NextDateInListPipe} from './next-date-in-list.pipe'; -import {IonBackButtonOverrideDirective} from './ion-back-button.directive'; @NgModule({ declarations: [ @@ -32,7 +31,6 @@ import {IonBackButtonOverrideDirective} from './ion-back-button.directive'; DateFromIndexPipe, DaytimeKeyPipe, NextDateInListPipe, - IonBackButtonOverrideDirective, ], exports: [ ArrayLastPipe, @@ -42,7 +40,6 @@ import {IonBackButtonOverrideDirective} from './ion-back-button.directive'; DateFromIndexPipe, DaytimeKeyPipe, NextDateInListPipe, - IonBackButtonOverrideDirective, ], }) export class UtilModule {}