From 937e731cfae7a637663dbdcd0293aa495eedbc0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A1=E8=89=B2?= <cipchk@qq.com>
Date: Wed, 17 Apr 2019 14:22:53 +0700
Subject: [PATCH] fix(module:upload): fix deprecated icon class property
 (#3230)

close #3228
---
 components/upload/demo/avatar.ts                |  2 +-
 components/upload/demo/basic.ts                 |  2 +-
 components/upload/demo/custom-request.ts        |  2 +-
 components/upload/demo/directory.ts             |  2 +-
 components/upload/demo/drag.ts                  |  2 +-
 components/upload/demo/file-list.ts             |  2 +-
 components/upload/demo/filter.ts                |  2 +-
 components/upload/demo/manually.ts              |  2 +-
 components/upload/demo/picture-card.ts          |  2 +-
 components/upload/demo/picture-style.ts         |  4 ++--
 components/upload/nz-upload-list.component.html | 12 ++++++------
 components/upload/upload.spec.ts                |  2 +-
 12 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/components/upload/demo/avatar.ts b/components/upload/demo/avatar.ts
index 03774204f65..819dd603d88 100644
--- a/components/upload/demo/avatar.ts
+++ b/components/upload/demo/avatar.ts
@@ -15,7 +15,7 @@ import { Observable, Observer } from 'rxjs';
       (nzChange)="handleChange($event)"
     >
       <ng-container *ngIf="!avatarUrl">
-        <i class="upload-icon" nz-icon [type]="loading ? 'loading' : 'plus'"></i>
+        <i class="upload-icon" nz-icon [nzType]="loading ? 'loading' : 'plus'"></i>
         <div class="ant-upload-text">Upload</div>
       </ng-container>
       <img *ngIf="avatarUrl" [src]="avatarUrl" class="avatar" />
diff --git a/components/upload/demo/basic.ts b/components/upload/demo/basic.ts
index 3eb46184ed5..63374cb3565 100644
--- a/components/upload/demo/basic.ts
+++ b/components/upload/demo/basic.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'nz-demo-upload-basic',
   template: `
     <nz-upload nzAction="https://jsonplaceholder.typicode.com/posts/">
-      <button nz-button><i nz-icon type="upload"></i><span>Click to Upload</span></button>
+      <button nz-button><i nz-icon nzType="upload"></i><span>Click to Upload</span></button>
     </nz-upload>
   `
 })
diff --git a/components/upload/demo/custom-request.ts b/components/upload/demo/custom-request.ts
index 5687ee09a6a..4f697e68d17 100644
--- a/components/upload/demo/custom-request.ts
+++ b/components/upload/demo/custom-request.ts
@@ -7,7 +7,7 @@ import { forkJoin } from 'rxjs';
   selector: 'nz-demo-upload-custom-request',
   template: `
     <nz-upload nzAction="https://jsonplaceholder.typicode.com/posts/" [nzCustomRequest]="customReq">
-      <button nz-button><i nz-icon type="upload"></i><span>Click to Upload</span></button>
+      <button nz-button><i nz-icon nzType="upload"></i><span>Click to Upload</span></button>
     </nz-upload>
   `
 })
diff --git a/components/upload/demo/directory.ts b/components/upload/demo/directory.ts
index 7d5bd48964c..912be49df5b 100644
--- a/components/upload/demo/directory.ts
+++ b/components/upload/demo/directory.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'nz-demo-upload-directory',
   template: `
     <nz-upload nzAction="https://jsonplaceholder.typicode.com/posts/" nzDirectory>
-      <button nz-button><i nz-icon type="upload"></i> Upload Directory</button>
+      <button nz-button><i nz-icon nzType="upload"></i> Upload Directory</button>
     </nz-upload>
   `
 })
diff --git a/components/upload/demo/drag.ts b/components/upload/demo/drag.ts
index dd3af0e5a95..34d70b2e23d 100644
--- a/components/upload/demo/drag.ts
+++ b/components/upload/demo/drag.ts
@@ -12,7 +12,7 @@ import { NzMessageService } from 'ng-zorro-antd';
       (nzChange)="handleChange($event)"
     >
       <p class="ant-upload-drag-icon">
-        <i nz-icon type="inbox"></i>
+        <i nz-icon nzType="inbox"></i>
       </p>
       <p class="ant-upload-text">Click or drag file to this area to upload</p>
       <p class="ant-upload-hint">
diff --git a/components/upload/demo/file-list.ts b/components/upload/demo/file-list.ts
index 37e4fe1a7b6..23b98987011 100644
--- a/components/upload/demo/file-list.ts
+++ b/components/upload/demo/file-list.ts
@@ -4,7 +4,7 @@ import { Component } from '@angular/core';
   selector: 'nz-demo-upload-file-list',
   template: `
     <nz-upload nzAction="https://jsonplaceholder.typicode.com/posts/" [nzFileList]="fileList">
-      <button nz-button><i nz-icon type="upload"></i><span>Upload</span></button>
+      <button nz-button><i nz-icon nzType="upload"></i><span>Upload</span></button>
     </nz-upload>
   `
 })
diff --git a/components/upload/demo/filter.ts b/components/upload/demo/filter.ts
index 68e209eecda..c94e651d7d8 100644
--- a/components/upload/demo/filter.ts
+++ b/components/upload/demo/filter.ts
@@ -13,7 +13,7 @@ import { Observable, Observer } from 'rxjs';
       [nzFilter]="filters"
       (nzChange)="handleChange($event)"
     >
-      <button nz-button><i nz-icon type="upload"></i><span>Upload</span></button>
+      <button nz-button><i nz-icon nzType="upload"></i><span>Upload</span></button>
     </nz-upload>
   `
 })
diff --git a/components/upload/demo/manually.ts b/components/upload/demo/manually.ts
index 2f31131d955..1253c12de07 100644
--- a/components/upload/demo/manually.ts
+++ b/components/upload/demo/manually.ts
@@ -7,7 +7,7 @@ import { filter } from 'rxjs/operators';
   selector: 'nz-demo-upload-manually',
   template: `
     <nz-upload [(nzFileList)]="fileList" [nzBeforeUpload]="beforeUpload">
-      <button nz-button><i nz-icon type="upload"></i><span>Select File</span></button>
+      <button nz-button><i nz-icon nzType="upload"></i><span>Select File</span></button>
     </nz-upload>
     <button
       nz-button
diff --git a/components/upload/demo/picture-card.ts b/components/upload/demo/picture-card.ts
index 88d102cca52..030d643867f 100644
--- a/components/upload/demo/picture-card.ts
+++ b/components/upload/demo/picture-card.ts
@@ -13,7 +13,7 @@ import { UploadFile } from 'ng-zorro-antd';
         [nzShowUploadList]="showUploadList"
         [nzPreview]="handlePreview"
       >
-        <i nz-icon type="plus"></i>
+        <i nz-icon nzType="plus"></i>
         <div class="ant-upload-text">Upload</div>
       </nz-upload>
       <nz-modal
diff --git a/components/upload/demo/picture-style.ts b/components/upload/demo/picture-style.ts
index dd641024d0a..45c9ae348c5 100644
--- a/components/upload/demo/picture-style.ts
+++ b/components/upload/demo/picture-style.ts
@@ -5,7 +5,7 @@ import { Component } from '@angular/core';
   template: `
     <div class="clearfix">
       <nz-upload nzAction="https://jsonplaceholder.typicode.com/posts/" nzListType="picture" [(nzFileList)]="fileList1">
-        <button nz-button><i nz-icon type="upload"></i><span>Upload</span></button>
+        <button nz-button><i nz-icon nzType="upload"></i><span>Upload</span></button>
       </nz-upload>
     </div>
     <br /><br />
@@ -17,7 +17,7 @@ import { Component } from '@angular/core';
         [(nzFileList)]="fileList2"
       >
         <button nz-button>
-          <span><i nz-icon type="upload"></i> Upload</span>
+          <span><i nz-icon nzType="upload"></i> Upload</span>
         </button>
       </nz-upload>
     </div>
diff --git a/components/upload/nz-upload-list.component.html b/components/upload/nz-upload-list.component.html
index f7e62d09bbd..f3cb397af75 100644
--- a/components/upload/nz-upload-list.component.html
+++ b/components/upload/nz-upload-list.component.html
@@ -5,7 +5,7 @@
     </ng-container>
     <ng-template #thumbUrlCheck>
       <i *ngIf="!file.thumbUrl && !file.url; else thumbTpl"
-        class="ant-upload-list-item-thumbnail" nz-icon type="picture" theme="twotone"></i>
+        class="ant-upload-list-item-thumbnail" nz-icon nzType="picture" theme="twotone"></i>
     </ng-template>
     <ng-template #thumbTpl>
       <a class="ant-upload-list-item-thumbnail" target="_blank" rel="noopener noreferrer"
@@ -14,8 +14,8 @@
         <img *ngIf="isImageUrl(file); else noThumbTpl" [src]="file.thumbUrl || file.url" [attr.alt]="file.name" />
       </a>
     </ng-template>
-    <ng-template #noThumbTpl><i class="ant-upload-list-item-icon" nz-icon type="file" theme="twotone"></i></ng-template>
-    <ng-template #noPicTpl><i nz-icon [type]="file.status === 'uploading' ? 'loading' : 'paper-clip'"></i></ng-template>
+    <ng-template #noThumbTpl><i class="ant-upload-list-item-icon" nz-icon nzType="file" theme="twotone"></i></ng-template>
+    <ng-template #noPicTpl><i nz-icon [nzType]="file.status === 'uploading' ? 'loading' : 'paper-clip'"></i></ng-template>
   </ng-template>
   <ng-template #preview>
     <ng-container *ngIf="file.url; else prevText">
@@ -43,13 +43,13 @@
         title="{{ locale.previewFile }}"
         [ngStyle]="!(file.url || file.thumbUrl) && {'opacity': .5, 'pointer-events': 'none'}"
         (click)="handlePreview(file, $event)">
-          <i nz-icon type="eye-o"></i>
+          <i nz-icon nzType="eye-o"></i>
       </a>
-      <i *ngIf="icons.showRemoveIcon" (click)="handleRemove(file, $event)" class="anticon anticon-delete" title="{{ locale.removeFile }}"></i>
+      <i *ngIf="icons.showRemoveIcon" (click)="handleRemove(file, $event)" nz-icon nzType="delete" title="{{ locale.removeFile }}"></i>
     </span>
   </ng-container>
   <ng-template #close>
-    <i *ngIf="icons.showRemoveIcon" (click)="handleRemove(file, $event)" nz-icon type="close" title="{{ locale.removeFile }}"></i>
+    <i *ngIf="icons.showRemoveIcon" (click)="handleRemove(file, $event)" nz-icon nzType="close" title="{{ locale.removeFile }}"></i>
   </ng-template>
   <div *ngIf="file.status === 'uploading'" class="ant-upload-list-item-progress">
     <nz-progress [nzPercent]="file.percent" [nzShowInfo]="false" [nzStrokeWidth]="2"></nz-progress>
diff --git a/components/upload/upload.spec.ts b/components/upload/upload.spec.ts
index 49c3539899c..2b0856e03fd 100644
--- a/components/upload/upload.spec.ts
+++ b/components/upload/upload.spec.ts
@@ -1274,7 +1274,7 @@ describe('upload', () => {
       (nzFileListChange)="nzFileListChange($event)"
       (nzChange)="nzChange($event)"
     >
-      <button nz-button><i nz-icon type="upload"></i><span>Click to Upload</span></button>
+      <button nz-button><i nz-icon nzType="upload"></i><span>Click to Upload</span></button>
     </nz-upload>
   `
 })