Commit 35a6025b authored by Marcelo Rivera's avatar Marcelo Rivera Committed by Mark Harding

[Sprint/FunnyFrog] (fix): scroll issues in notifications page

parent ad0435d4
<div class="m-notifications--flyout--wrapper mdl-card mdl-shadow--3dp">
<div class="m-notifications--flyout--scrollable-container">
<minds-notifications #notifications [loadOnDemand]="true" [hidden]="!visible" [visible]="visible"></minds-notifications>
<minds-notifications #notifications [loadOnDemand]="true" [hidden]="!visible" [visible]="visible" [useOwnScrollSource]="true"></minds-notifications>
</div>
<div class="m-notifications--flyout--bottom-container mdl-color--blue-grey-50 mdl-color-text--blue-grey-200">
<a [routerLink]="['/notifications']" (click)="close()" i18n="@@NOTIFICATIONS__FLYOUT__VIEW_ALL_ACTION"> View all </a>
......
......@@ -23,7 +23,7 @@ describe('NotificationsFlyoutComponent', () => {
MockDirective({ selector: '[mdl]', inputs: ['mdl'] }),
MockComponent({
selector: 'minds-notifications',
inputs: ['loadOnDemand', 'hidden', 'visible'],
inputs: ['loadOnDemand', 'hidden', 'visible', 'useOwnScrollSource'],
}, ['onVisible']),
NotificationsFlyoutComponent,
],
......
......@@ -67,7 +67,7 @@
distance="25%"
(load)="load()"
[moreData]="moreData"
[scrollSource]="notificationGrid"
[scrollSource]="useOwnScrollSource ? notificationGrid : null"
[inProgress]="inProgress"
*ngIf="visible"
>
......
......@@ -7,6 +7,7 @@ import { MindsTitle } from '../../services/ux/title';
import { Client } from '../../services/api/client';
import { Session } from '../../services/session';
import { NotificationService } from './notification.service';
import { InfiniteScroll } from "../../common/components/infinite-scroll/infinite-scroll";
@Component({
moduleId: module.id,
......@@ -20,6 +21,7 @@ export class NotificationsComponent {
@Input() params: any;
@Input() count: number;
@Input() loadOnDemand: boolean;
@Input() useOwnScrollSource: boolean;
@ViewChild('notificationGrid', { static: true }) notificationList: ElementRef;
notifications: Array<Object> = [];
entity;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment