Skip to content

fix(MatPaginatorIntl): Provide a provider if exists. #7895

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 2, 2017
Merged

fix(MatPaginatorIntl): Provide a provider if exists. #7895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
68008f3
fix(MatPaginatorIntl): Provide a provider if exists.
Jefiozie Oct 19, 2017
d40e8ee
style(paginator): Changed arguments, removed spacing
Jefiozie Oct 23, 2017
826369a
style(paginator): Changed argument name.
Jefiozie Oct 23, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/lib/paginator/paginator-intl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* found in the LICENSE file at https://angular.io/license
*/

import {Injectable} from '@angular/core';
import {Injectable, SkipSelf, Optional } from '@angular/core';
import {Subject} from 'rxjs/Subject';

/**
Expand Down Expand Up @@ -46,3 +46,16 @@ export class MatPaginatorIntl {
return `${startIndex + 1} - ${endIndex} of ${length}`;
}
}

/** @docs-private */
export function MAT_PAGINATOR_INTL_PROVIDER_FACTORY(parentIntl: MatPaginatorIntl) {
return parentIntl || new MatPaginatorIntl();
}

/** @docs-private */
export const MAT_PAGINATOR_INTL_PROVIDER = {
// If there is already an MatPaginatorIntl available, use that. Otherwise, provide a new one.
provide: MatPaginatorIntl,
deps: [[new Optional(), new SkipSelf(), MatPaginatorIntl]],
useFactory: MAT_PAGINATOR_INTL_PROVIDER_FACTORY
};
4 changes: 2 additions & 2 deletions src/lib/paginator/paginator-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {MatButtonModule} from '@angular/material/button';
import {MatSelectModule} from '@angular/material/select';
import {MatTooltipModule} from '@angular/material/tooltip';
import {MatPaginator} from './paginator';
import {MatPaginatorIntl} from './paginator-intl';
import {MAT_PAGINATOR_INTL_PROVIDER} from './paginator-intl';


@NgModule({
Expand All @@ -24,6 +24,6 @@ import {MatPaginatorIntl} from './paginator-intl';
],
exports: [MatPaginator],
declarations: [MatPaginator],
providers: [MatPaginatorIntl],
providers: [MAT_PAGINATOR_INTL_PROVIDER],
})
export class MatPaginatorModule {}