socialnetworknews-web

commit 7f17d81c30360a301ea6c69b4c3a9afae9d73565
parent 187394326a1ad4584cc9dfed5fd0c68e3c4ccb80
Author: MTRNord <mtrnord1@gmail.com>
Date:   Thu, 15 Mar 2018 18:27:29 +0100

Trx fixing anchor scrolling via a third party dep

Diffstat:
M
package.json
 | 
2
+-
M
src/app/app.module.ts
 | 
2
++
M
src/app/tweet-list/tweet-list.component.html
 | 
4
++--
M
src/app/tweet-list/tweet-list.component.ts
 | 
17
+++--------------
M
yarn.lock
 | 
16
+++-------------

5 files changed, 11 insertions(+), 30 deletions(-)
diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "express": "^4.16.2",
     "font-awesome": "^4.7.0",
     "hammerjs": "^2.0.8",
-    "ng-gallery": "^1.0.1",
+    "ng2-page-scroll": "^4.0.0-beta.12",
     "ngx-avatar": "^2.9.0",
     "ngx-toastr": "^8.3.0",
     "raven-js": "^3.22.3",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
@@ -16,6 +16,7 @@ import { ApiService } from './api.service';
 
 import * as Raven from 'raven-js';
 import {ToastrModule} from 'ngx-toastr';
+import {Ng2PageScrollModule} from 'ng2-page-scroll';
 Raven
   .config('https://b760c9f9035c472998ada3a02dcc81d3@sentry.io/294520', {
     environment: 'development',
@@ -48,6 +49,7 @@ export class RavenErrorHandler implements ErrorHandler {
     // MDBBootstrapModule.forRoot(),
     AppRoutingModule,
     BrowserAnimationsModule,
+    Ng2PageScrollModule,
     AvatarModule,
     HttpClientModule,
     ToastrModule.forRoot(), // ToastrModule added
diff --git a/src/app/tweet-list/tweet-list.component.html b/src/app/tweet-list/tweet-list.component.html
@@ -8,12 +8,12 @@
         </span>
       </div>
       <div>
-        <a [fragment]="'#img'+i" >
+        <a pageScroll [href]="'img'+i" >
           <img *ngIf="item.image_urls && item.image_urls[0]" [src]="item.image_urls[0]" class="thumbnail">
         </a>
 
         <!-- lightbox container hidden with CSS -->
-        <a fragment="#_" target="_self" class="lightbox" [id]="'#img'+i">
+        <a pageScroll href="#_" class="lightbox" [id]="'#img'+i">
           <img src="http://insomnia.rest/images/screens/main.png">
         </a>
 
diff --git a/src/app/tweet-list/tweet-list.component.ts b/src/app/tweet-list/tweet-list.component.ts
@@ -1,4 +1,4 @@
-import {Component, Input, OnInit, AfterViewChecked} from '@angular/core';
+import {Component, Input, OnInit} from '@angular/core';
 import * as Raven from 'raven-js';
 import {ApiService, TweetsEntity} from '../api.service';
 import {Observable} from 'rxjs/Observable';
@@ -10,7 +10,6 @@ import 'rxjs/add/operator/take';
 import 'rxjs/add/operator/concat';
 import 'rxjs/add/observable/throw';
 import {ToastrService} from 'ngx-toastr';
-import {ActivatedRoute} from '@angular/router';
 
 
 @Component({
@@ -18,12 +17,11 @@ import {ActivatedRoute} from '@angular/router';
   templateUrl: './tweet-list.component.html',
   styleUrls: ['./tweet-list.component.scss']
 })
-export class TweetListComponent implements OnInit, AfterViewChecked {
+export class TweetListComponent implements OnInit {
   @Input() uuid;
   data: (TweetsEntity)[];
-  private fragment: Observable<string>;
 
-  constructor(private apiService: ApiService, private toastr: ToastrService, private route: ActivatedRoute) {
+  constructor(private apiService: ApiService, private toastr: ToastrService) {
     Raven.captureBreadcrumb({
       message: 'Showing Paper',
       category: 'paper',
@@ -35,15 +33,6 @@ export class TweetListComponent implements OnInit, AfterViewChecked {
 
   ngOnInit() {
     this.getYesterday();
-    this.route.fragment.subscribe(fragment => { this.fragment = fragment; });
-  }
-
-  ngAfterViewChecked(): void {
-    try {
-      if (this.fragment) {
-        document.querySelector('#' + this.fragment).scrollIntoView();
-      }
-    } catch (e) { }
   }
 
   getYesterday() {
diff --git a/yarn.lock b/yarn.lock
@@ -370,12 +370,6 @@ amdefine@>=0.0.4:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
 
-angular-bootstrap-md@^5.1.2:
-  version "5.2.2"
-  resolved "https://registry.yarnpkg.com/angular-bootstrap-md/-/angular-bootstrap-md-5.2.2.tgz#9554dbe65aa99d092a2763f2d712246286abc101"
-  dependencies:
-    moment "2.18.x"
-
 ansi-html@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e"
@@ -4000,10 +3994,6 @@ mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkd
   dependencies:
     minimist "0.0.8"
 
-moment@2.18.x:
-  version "2.18.1"
-  resolved "https://registry.yarnpkg.com/moment/-/moment-2.18.1.tgz#c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"
-
 moment@^2.10.6:
   version "2.21.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a"
@@ -4077,9 +4067,9 @@ neo-async@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.5.0.tgz#76b1c823130cca26acfbaccc8fbaf0a2fa33b18f"
 
-ng-gallery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/ng-gallery/-/ng-gallery-1.0.1.tgz#a3a90a91bb33b2d0f624d7e1ff12f2425a57b3ce"
+ng2-page-scroll@^4.0.0-beta.12:
+  version "4.0.0-beta.12"
+  resolved "https://registry.yarnpkg.com/ng2-page-scroll/-/ng2-page-scroll-4.0.0-beta.12.tgz#26b4e71ef9ad0859f1fa4e5e8d6ce7c75b73c6f7"
 
 ngx-avatar@^2.9.0:
   version "2.9.0"