From 07a982363fcc6f838dd3f5c2039a2affaea3b0b2 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Tue, 8 Jan 2019 15:06:58 +0100
Subject: [PATCH] Correctly scroll in notification preferences

---
 .../my-account-notifications.component.html                 | 2 +-
 .../my-account-settings/my-account-settings.component.html  | 6 ++----
 client/src/app/app-routing.module.ts                        | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
index d2810c343..b98a1087e 100644
--- a/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
+++ b/client/src/app/+my-account/my-account-notifications/my-account-notifications.component.html
@@ -1,5 +1,5 @@
 <div class="header">
-  <a routerLink="/my-account/settings" i18n>Notification preferences</a>
+  <a routerLink="/my-account/settings" fragment="notifications" i18n>Notification preferences</a>
 
   <button (click)="markAllAsRead()" i18n>Mark all as read</button>
 </div>
diff --git a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
index 2eb7dd56e..ad64f28fe 100644
--- a/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
+++ b/client/src/app/+my-account/my-account-settings/my-account-settings.component.html
@@ -4,10 +4,8 @@
   <span i18n class="user-quota-label">Video quota:</span> {{ userVideoQuotaUsed | bytes: 0 }} / {{ userVideoQuota }}
 </div>
 
-<ng-template [ngIf]="user && user.account">
-  <div i18n class="account-title">Profile</div>
-  <my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile>
-</ng-template>
+<div i18n class="account-title">Profile</div>
+<my-account-profile [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-profile>
 
 <div i18n class="account-title" id="notifications">Notifications</div>
 <my-account-notification-preferences [user]="user" [userInformationLoaded]="userInformationLoaded"></my-account-notification-preferences>
diff --git a/client/src/app/app-routing.module.ts b/client/src/app/app-routing.module.ts
index 545d6aeda..cff37a7d6 100644
--- a/client/src/app/app-routing.module.ts
+++ b/client/src/app/app-routing.module.ts
@@ -43,7 +43,8 @@ const routes: Routes = [
   imports: [
     RouterModule.forRoot(routes, {
       useHash: Boolean(history.pushState) === false,
-      preloadingStrategy: PreloadSelectedModulesList
+      preloadingStrategy: PreloadSelectedModulesList,
+      anchorScrolling: 'enabled'
     })
   ],
   providers: [
-- 
2.41.0