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

fix static default pagination (#4288)

Browse Source
This commit is contained in:
Eugenio Romano
2019-02-08 01:58:06 +00:00
committed by GitHub
parent 8fa335aced
commit d884c1099b
4 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/content-services/content-node-selector/content-node-selector-panel.component.ts
View File

@@ -16,7 +16,13 @@
*/ */
import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core'; import { Component, EventEmitter, Input, OnInit, Output, ViewChild, ViewEncapsulation } from '@angular/core';
import { HighlightDirective, UserPreferencesService, PaginationModel, UserPreferenceValues, InfinitePaginationComponent } from '@alfresco/adf-core'; import {
HighlightDirective,
UserPreferencesService,
PaginationModel,
UserPreferenceValues,
InfinitePaginationComponent
} from '@alfresco/adf-core';
import { FormControl } from '@angular/forms'; import { FormControl } from '@angular/forms';
import { Node, NodePaging, Pagination, SiteEntry, SitePaging } from '@alfresco/js-api'; import { Node, NodePaging, Pagination, SiteEntry, SitePaging } from '@alfresco/js-api';
import { DocumentListComponent } from '../document-list/components/document-list.component'; import { DocumentListComponent } from '../document-list/components/document-list.component';
@@ -40,7 +46,7 @@ const defaultValidation = () => true;
}) })
export class ContentNodeSelectorPanelComponent implements OnInit { export class ContentNodeSelectorPanelComponent implements OnInit {
static DEFAULT_PAGINATION: Pagination = new Pagination({ DEFAULT_PAGINATION: Pagination = new Pagination({
maxItems: 25, maxItems: 25,
skipCount: 0, skipCount: 0,
totalItems: 0, totalItems: 0,
@@ -111,7 +117,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit {
/** Number of items shown per page in the list. */ /** Number of items shown per page in the list. */
@Input() @Input()
pageSize: number = ContentNodeSelectorPanelComponent.DEFAULT_PAGINATION.maxItems; pageSize: number = this.DEFAULT_PAGINATION.maxItems;
/** Function used to decide if the selected node has permission to be selected. /** Function used to decide if the selected node has permission to be selected.
* Default value is a function that always returns true. * Default value is a function that always returns true.
@@ -146,7 +152,7 @@ export class ContentNodeSelectorPanelComponent implements OnInit {
_chosenNode: Node = null; _chosenNode: Node = null;
folderIdToShow: string | null = null; folderIdToShow: string | null = null;
pagination: PaginationModel = ContentNodeSelectorPanelComponent.DEFAULT_PAGINATION; pagination: PaginationModel = this.DEFAULT_PAGINATION;
@ViewChild(InfinitePaginationComponent) @ViewChild(InfinitePaginationComponent)
infinitePaginationComponent: InfinitePaginationComponent; infinitePaginationComponent: InfinitePaginationComponent;

8
lib/content-services/document-list/components/document-list.component.ts
View File

@@ -70,7 +70,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
static SINGLE_CLICK_NAVIGATION: string = 'click'; static SINGLE_CLICK_NAVIGATION: string = 'click';
static DOUBLE_CLICK_NAVIGATION: string = 'dblclick'; static DOUBLE_CLICK_NAVIGATION: string = 'dblclick';
static DEFAULT_PAGINATION: Pagination = new Pagination({ DEFAULT_PAGINATION: Pagination = new Pagination({
hasMoreItems: false, hasMoreItems: false,
skipCount: 0, skipCount: 0,
maxItems: 25, maxItems: 25,
@@ -248,7 +248,7 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
/** Default value is stored into user preference settings use it only if you are not using the pagination */ /** Default value is stored into user preference settings use it only if you are not using the pagination */
@Input() @Input()
maxItems: number = DocumentListComponent.DEFAULT_PAGINATION.maxItems; maxItems: number = this.DEFAULT_PAGINATION.maxItems;
/** Emitted when the user clicks a list node */ /** Emitted when the user clicks a list node */
@Output() @Output()
@@ -290,8 +290,8 @@ export class DocumentListComponent implements OnInit, OnChanges, OnDestroy, Afte
// @deprecated 3.0.0 // @deprecated 3.0.0
folderNode: Node; folderNode: Node;
private _pagination: PaginationModel = DocumentListComponent.DEFAULT_PAGINATION; private _pagination: PaginationModel = this.DEFAULT_PAGINATION;
pagination: BehaviorSubject<PaginationModel> = new BehaviorSubject<PaginationModel>(DocumentListComponent.DEFAULT_PAGINATION); pagination: BehaviorSubject<PaginationModel> = new BehaviorSubject<PaginationModel>(this.DEFAULT_PAGINATION);
private layoutPresets = {}; private layoutPresets = {};
private subscriptions: Subscription[] = []; private subscriptions: Subscription[] = [];

1
lib/core/datatable/components/datatable/datatable.component.scss
View File

@@ -425,7 +425,6 @@
white-space: nowrap; white-space: nowrap;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
line-height: 1.12em;
} }
/* query for Microsoft IE 11*/ /* query for Microsoft IE 11*/

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

@@ -70,7 +70,7 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
ngOnInit() { ngOnInit() {
if (this.target) { if (this.target) {
this.paginationSubscription = this.target.pagination.subscribe((pagination) => { this.paginationSubscription = this.target.pagination.subscribe((pagination: PaginationModel) => {
this.isLoading = false; this.isLoading = false;
this.pagination = pagination; this.pagination = pagination;