mirror of
https://github.com/Alfresco/alfresco-ng2-components.git
synced 2025-07-31 17:38:48 +00:00
[ADF-1731] update material2 beta12 e angular2 4.4.5 (#2475)
* update material2 beta12 update angular2 4.4.5 * fix changed version js-api * update types hammerjs * fix test * clean old doc * fix pagination test * fix test * missing update packages * fix <mat-form-field> for select box * start task component test
This commit is contained in:
committed by
Denys Vuika
parent
9663971256
commit
fcb292c849
Binary file not shown.
Before Width: | Height: | Size: 155 KiB |
Binary file not shown.
Before Width: | Height: | Size: 171 KiB |
@@ -43,17 +43,17 @@
|
||||
"alfresco"
|
||||
],
|
||||
"dependencies": {
|
||||
"@angular/animations": "4.3.6",
|
||||
"@angular/cdk": "2.0.0-beta.10",
|
||||
"@angular/common": "4.3.6",
|
||||
"@angular/compiler": "4.3.6",
|
||||
"@angular/core": "4.3.6",
|
||||
"@angular/forms": "4.3.6",
|
||||
"@angular/http": "4.3.6",
|
||||
"@angular/material": "2.0.0-beta.10",
|
||||
"@angular/platform-browser": "4.3.6",
|
||||
"@angular/platform-browser-dynamic": "4.3.6",
|
||||
"@angular/router": "4.3.6",
|
||||
"@angular/animations": "4.4.5",
|
||||
"@angular/cdk": "2.0.0-beta.12",
|
||||
"@angular/common": "4.4.5",
|
||||
"@angular/compiler": "4.4.5",
|
||||
"@angular/core": "4.4.5",
|
||||
"@angular/forms": "4.4.5",
|
||||
"@angular/http": "4.4.5",
|
||||
"@angular/material": "2.0.0-beta.12",
|
||||
"@angular/platform-browser": "4.4.5",
|
||||
"@angular/platform-browser-dynamic": "4.4.5",
|
||||
"@angular/router": "4.4.5",
|
||||
"@ngx-translate/core": "7.0.0",
|
||||
"alfresco-js-api": "1.9.0",
|
||||
"core-js": "2.4.1",
|
||||
@@ -66,7 +66,7 @@
|
||||
"zone.js": "0.8.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@types/hammerjs": "2.0.34",
|
||||
"@types/hammerjs": "2.0.35",
|
||||
"@types/jasmine": "2.5.35",
|
||||
"@types/node": "6.0.45",
|
||||
"adf-tslint-rules": "0.0.3",
|
||||
|
@@ -5,15 +5,15 @@
|
||||
[class.upload-dialog--position-right]="position === 'right'">
|
||||
<header class="upload-dialog__header">
|
||||
<button
|
||||
md-button
|
||||
mat-button
|
||||
color="secondary"
|
||||
[disabled]="isConfirmation"
|
||||
(click)="toggleMinimized()">
|
||||
<md-icon
|
||||
md-list-icon
|
||||
<mat-icon
|
||||
mat-list-icon
|
||||
title="{{ (isDialogMinimized ? 'ADF_FILE_UPLOAD.BUTTON.MAXIMIZE': 'ADF_FILE_UPLOAD.BUTTON.MINIMIZE') | translate }}">
|
||||
{{ isDialogMinimized ? 'keyboard_arrow_up' : 'keyboard_arrow_down' }}
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
</button>
|
||||
|
||||
<span
|
||||
@@ -90,7 +90,7 @@
|
||||
[class.upload-dialog--hide]="isConfirmation">
|
||||
<button
|
||||
color="primary"
|
||||
md-button
|
||||
mat-button
|
||||
*ngIf="!uploadList.isUploadCompleted() && !uploadList.isUploadCancelled()"
|
||||
(click)="toggleConfirmation()">
|
||||
{{ 'ADF_FILE_UPLOAD.BUTTON.CANCEL_ALL' | translate }}
|
||||
@@ -98,7 +98,7 @@
|
||||
|
||||
<button
|
||||
*ngIf="uploadList.isUploadCompleted() || uploadList.isUploadCancelled()"
|
||||
md-button
|
||||
mat-button
|
||||
color="primary"
|
||||
(click)="close($event)">
|
||||
{{ 'ADF_FILE_UPLOAD.BUTTON.CLOSE' | translate }}
|
||||
@@ -110,13 +110,13 @@
|
||||
[class.upload-dialog--hide]="!isConfirmation">
|
||||
<button
|
||||
color="secondary"
|
||||
md-button
|
||||
mat-button
|
||||
(click)="cancelAllUploads()">
|
||||
{{ 'ADF_FILE_UPLOAD.CONFIRMATION.BUTTON.CANCEL' | translate }}
|
||||
</button>
|
||||
|
||||
<button
|
||||
md-button
|
||||
mat-button
|
||||
color="primary"
|
||||
(click)="toggleConfirmation()">
|
||||
{{ 'ADF_FILE_UPLOAD.CONFIRMATION.BUTTON.CONTINUE' | translate }}
|
||||
|
@@ -88,7 +88,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
& md-icon {
|
||||
& mat-icon {
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
@@ -1,9 +1,9 @@
|
||||
<div class="adf-file-uploading-row">
|
||||
<md-icon
|
||||
md-list-icon
|
||||
<mat-icon
|
||||
mat-list-icon
|
||||
class="adf-file-uploading-row__type">
|
||||
insert_drive_file
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
|
||||
<span
|
||||
class="adf-file-uploading-row__name"
|
||||
@@ -20,11 +20,11 @@
|
||||
{{ file.progress.loaded | adfFileSize }} / {{ file.progress.total | adfFileSize }}
|
||||
</span>
|
||||
|
||||
<md-icon
|
||||
md-list-icon
|
||||
<mat-icon
|
||||
mat-list-icon
|
||||
class="adf-file-uploading-row__action adf-file-uploading-row__action--cancel">
|
||||
clear
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
</div>
|
||||
|
||||
<div
|
||||
@@ -32,43 +32,43 @@
|
||||
(click)="onRemove(file)"
|
||||
class="adf-file-uploading-row__group adf-file-uploading-row__group--toggle"
|
||||
title="{{ 'ADF_FILE_UPLOAD.BUTTON.REMOVE_FILE' | translate }}">
|
||||
<md-icon
|
||||
md-list-icon
|
||||
<mat-icon
|
||||
mat-list-icon
|
||||
class="adf-file-uploading-row__status adf-file-uploading-row__status--done">
|
||||
check_circle
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
|
||||
<md-icon
|
||||
md-list-icon
|
||||
<mat-icon
|
||||
mat-list-icon
|
||||
class="adf-file-uploading-row__action adf-file-uploading-row__action--remove">
|
||||
remove_circle
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
</div>
|
||||
|
||||
<div
|
||||
*ngIf="file.status === FileUploadStatus.Pending"
|
||||
(click)="onCancel(file)"
|
||||
class="adf-file-uploading-row__group adf-file-uploading-row__group--toggle">
|
||||
<md-icon
|
||||
md-list-icon
|
||||
<mat-icon
|
||||
mat-list-icon
|
||||
class="adf-file-uploading-row__status adf-file-uploading-row__status--pending">
|
||||
schedule
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
|
||||
<md-icon
|
||||
md-list-icon
|
||||
<mat-icon
|
||||
mat-list-icon
|
||||
class="adf-file-uploading-row__action adf-file-uploading-row__action--remove">
|
||||
remove_circle
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
</div>
|
||||
|
||||
<div
|
||||
*ngIf="file.status === FileUploadStatus.Error"
|
||||
class="adf-file-uploading-row__block adf-file-uploading-row__status--error"
|
||||
title="{{ file.response }}">
|
||||
<md-icon md-list-icon>
|
||||
<mat-icon mat-list-icon>
|
||||
report_problem
|
||||
</md-icon>
|
||||
</mat-icon>
|
||||
</div>
|
||||
|
||||
<div
|
||||
|
@@ -2,8 +2,8 @@
|
||||
<!--Files Upload-->
|
||||
<a *ngIf="!uploadFolders"
|
||||
[disabled]="isButtonDisabled()"
|
||||
md-raised-button color="primary">
|
||||
<md-icon>file_upload</md-icon>
|
||||
mat-raised-button color="primary">
|
||||
<mat-icon>file_upload</mat-icon>
|
||||
|
||||
<!--Multiple Files Upload-->
|
||||
<span *ngIf="multipleFiles">
|
||||
@@ -51,8 +51,8 @@
|
||||
|
||||
<!--Folders Upload-->
|
||||
<a *ngIf="uploadFolders"
|
||||
[disabled]="isButtonDisabled()" md-raised-button color="primary">
|
||||
<md-icon>file_upload</md-icon>
|
||||
[disabled]="isButtonDisabled()" mat-raised-button color="primary">
|
||||
<mat-icon>file_upload</mat-icon>
|
||||
<label
|
||||
id="uploadFolder-label"
|
||||
*ngIf="!staticTitle"
|
||||
|
@@ -17,16 +17,16 @@
|
||||
|
||||
import { NgModule } from '@angular/core';
|
||||
import {
|
||||
MdButtonModule,
|
||||
MdIconModule,
|
||||
MdProgressSpinnerModule
|
||||
MatButtonModule,
|
||||
MatIconModule,
|
||||
MatProgressSpinnerModule
|
||||
} from '@angular/material';
|
||||
|
||||
export function modules() {
|
||||
return [
|
||||
MdIconModule,
|
||||
MdProgressSpinnerModule,
|
||||
MdButtonModule
|
||||
MatIconModule,
|
||||
MatProgressSpinnerModule,
|
||||
MatButtonModule
|
||||
];
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user