inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-07-24 17:32:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

add reset pagination (#3239)

Browse Source
This commit is contained in:
Eugenio Romano
2018-04-26 15:15:02 +01:00
committed by GitHub
parent 8872706eab
commit b18b041ade
3 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
demo-shell/src/app/components/files/files.component.html
View File

@@ -346,7 +346,7 @@
(prevPage)="onPrevPage($event)"> (prevPage)="onPrevPage($event)">
</adf-pagination> </adf-pagination>
<adf-infinite-pagination <adf-infinite-pagination
*ngIf="infiniteScrolling" [hidden]="!infiniteScrolling"
[target]="documentList" [target]="documentList"
[loading]="documentList.infiniteLoading"> [loading]="documentList.infiniteLoading">
{{ 'ADF-DOCUMENT-LIST.LAYOUT.LOAD_MORE' | translate }} {{ 'ADF-DOCUMENT-LIST.LAYOUT.LOAD_MORE' | translate }}
@@ -448,7 +448,7 @@
</section> </section>
<section> <section>
<mat-slide-toggle color="primary" [(ngModel)]="infiniteScrolling"> <mat-slide-toggle color="primary" (click)="onInfiniteScrolling()">
{{'DOCUMENT_LIST.ENABLE_INFINITE_SCROLL' | translate}} {{'DOCUMENT_LIST.ENABLE_INFINITE_SCROLL' | translate}}
</mat-slide-toggle> </mat-slide-toggle>
</section> </section>

17
demo-shell/src/app/components/files/files.component.ts
View File

@@ -28,7 +28,7 @@ import {
AuthenticationService, AppConfigService, ContentService, TranslationService, AuthenticationService, AppConfigService, ContentService, TranslationService,
FileUploadEvent, FolderCreatedEvent, LogService, NotificationService, FileUploadEvent, FolderCreatedEvent, LogService, NotificationService,
UploadService, DataColumn, DataRow, UserPreferencesService, UploadService, DataColumn, DataRow, UserPreferencesService,
PaginationComponent, FormValues, DisplayMode, UserPreferenceValues PaginationComponent, FormValues, DisplayMode, UserPreferenceValues, InfinitePaginationComponent
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { DocumentListComponent, PermissionStyleModel } from '@alfresco/adf-content-services'; import { DocumentListComponent, PermissionStyleModel } from '@alfresco/adf-content-services';
@@ -149,6 +149,10 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
@ViewChild('standardPagination') @ViewChild('standardPagination')
standardPagination: PaginationComponent; standardPagination: PaginationComponent;
@ViewChild(InfinitePaginationComponent)
infinitePaginationComponent: InfinitePaginationComponent;
permissionsStyle: PermissionStyleModel[] = []; permissionsStyle: PermissionStyleModel[] = [];
infiniteScrolling: boolean; infiniteScrolling: boolean;
supportedPages: number[]; supportedPages: number[];
@@ -349,9 +353,6 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
} }
private reloadForInfiniteScrolling() { private reloadForInfiniteScrolling() {
if (this.infiniteScrolling) {
this.documentList.skipCount = 0;
}
this.documentList.reload(); this.documentList.reload();
} }
@@ -462,7 +463,7 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
this.turnedNextPage.emit(event); this.turnedNextPage.emit(event);
} }
loadNextBatch(event: Pagination) { loadNextBatch(event: Pagination): void {
this.loadNext.emit(event); this.loadNext.emit(event);
} }
@@ -484,4 +485,10 @@ export class FilesComponent implements OnInit, OnChanges, OnDestroy {
this.location.go(url); this.location.go(url);
} }
} }
onInfiniteScrolling(): void {
this.infiniteScrolling = !this.infiniteScrolling;
this.infinitePaginationComponent.reset();
this.reloadForInfiniteScrolling();
}
} }

5
lib/core/pagination/infinite-pagination.component.ts
View File

@@ -104,6 +104,11 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
} }
} }
reset() {
this.pagination.skipCount = 0;
this.target.updatePagination(this.pagination);
}
ngOnDestroy() { ngOnDestroy() {
if (this.paginationSubscription) { if (this.paginationSubscription) {
this.paginationSubscription.unsubscribe(); this.paginationSubscription.unsubscribe();