mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
[ADF-1895] update Material2 to 5.0.0-rc0 (#2621)
update Material2 to 5.0.0-rc0
This commit is contained in:
@@ -44,14 +44,14 @@
|
||||
],
|
||||
"dependencies": {
|
||||
"@angular/animations": "5.0.0",
|
||||
"@angular/cdk": "2.0.0-beta.12",
|
||||
"@angular/cdk": "5.0.0-rc0",
|
||||
"@angular/common": "5.0.0",
|
||||
"@angular/compiler": "5.0.0",
|
||||
"@angular/core": "5.0.0",
|
||||
"@angular/flex-layout": "2.0.0-beta.10",
|
||||
"@angular/forms": "5.0.0",
|
||||
"@angular/http": "5.0.0",
|
||||
"@angular/material": "2.0.0-beta.12",
|
||||
"@angular/material": "5.0.0-rc0",
|
||||
"@angular/platform-browser": "5.0.0",
|
||||
"@angular/platform-browser-dynamic": "5.0.0",
|
||||
"@angular/router": "5.0.0",
|
||||
|
@@ -16,10 +16,10 @@
|
||||
*/
|
||||
|
||||
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { MatDatepickerModule, MatIconModule, MatInputModule, MatNativeDateModule } from '@angular/material';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { Pagination } from 'alfresco-js-api';
|
||||
import { MaterialModule } from '../../material.module';
|
||||
import { InfinitePaginationComponent } from './infinite-pagination.component';
|
||||
|
||||
describe('InfinitePaginationComponent', () => {
|
||||
@@ -32,10 +32,7 @@ describe('InfinitePaginationComponent', () => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [
|
||||
NoopAnimationsModule,
|
||||
MatDatepickerModule,
|
||||
MatIconModule,
|
||||
MatInputModule,
|
||||
MatNativeDateModule
|
||||
MaterialModule
|
||||
],
|
||||
declarations: [
|
||||
InfinitePaginationComponent
|
||||
|
@@ -5,11 +5,11 @@
|
||||
</mat-toolbar>
|
||||
|
||||
<mat-card class="adf-setting-card">
|
||||
<mat-card-content>
|
||||
|
||||
<div *ngIf="providers==='ALL' || providers==='ECM'">
|
||||
<div *ngIf="providers==='ALL' || providers==='ECM'">
|
||||
<mat-card-header>
|
||||
<mat-card-subtitle>{{'CORE.HOST_SETTINGS.CS-HOST' | translate }}</mat-card-subtitle>
|
||||
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
<mat-form-field class="full-width">
|
||||
<mat-icon class="adf-CORE.HOST_SETTINGS-link-icon" matPrefix>link</mat-icon>
|
||||
<input matInput
|
||||
@@ -26,11 +26,14 @@
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
<p>
|
||||
</div>
|
||||
<p>
|
||||
<div *ngIf="providers==='ALL' || providers==='BPM'">
|
||||
|
||||
</mat-card-content>
|
||||
</div>
|
||||
<p>
|
||||
<div *ngIf="providers==='ALL' || providers==='BPM'">
|
||||
<mat-card-header>
|
||||
<mat-card-subtitle>{{'CORE.HOST_SETTINGS.BP-HOST' | translate }}</mat-card-subtitle>
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
|
||||
<mat-form-field class="full-width">
|
||||
<mat-icon class="adf-CORE.HOST_SETTINGS-link-icon" matPrefix>link</mat-icon>
|
||||
@@ -47,8 +50,8 @@
|
||||
{{ 'CORE.HOST_SETTINGS.NOT_VALID'| translate }}
|
||||
</mat-error>
|
||||
</mat-form-field>
|
||||
</div>
|
||||
</mat-card-content>
|
||||
</mat-card-content>
|
||||
</div>
|
||||
<mat-card-actions class="adf-CORE.HOST_SETTINGS-actions">
|
||||
|
||||
<button mat-button onclick="window.history.back()" color="primary">
|
||||
|
@@ -18,11 +18,13 @@
|
||||
import { NgModule } from '@angular/core';
|
||||
import {
|
||||
MatButtonModule,
|
||||
MatCardModule,
|
||||
MatDialogModule,
|
||||
MatIconModule,
|
||||
MatInputModule,
|
||||
MatMenuModule,
|
||||
MatProgressBarModule,
|
||||
MatProgressSpinnerModule,
|
||||
MatSnackBarModule,
|
||||
MatTabsModule,
|
||||
MatToolbarModule
|
||||
@@ -34,11 +36,13 @@ export function modules() {
|
||||
MatDialogModule,
|
||||
MatInputModule,
|
||||
MatProgressBarModule,
|
||||
MatProgressSpinnerModule,
|
||||
MatSnackBarModule,
|
||||
MatToolbarModule,
|
||||
MatTabsModule,
|
||||
MatMenuModule,
|
||||
MatIconModule
|
||||
MatIconModule,
|
||||
MatCardModule
|
||||
];
|
||||
}
|
||||
|
||||
|
@@ -214,4 +214,7 @@ export class MomentDateAdapter extends DateAdapter<Moment> {
|
||||
return this.isValid(d) ? d : null;
|
||||
}
|
||||
|
||||
invalid(): Moment {
|
||||
return moment.invalid();
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user