feat(module:upload): using optional HttpClientModule (#931)

close #934 close #926
NG-ZORRO · Jan 20, 2018 · 9bf9752 · 9bf9752
1 parent d70af03
commit 9bf9752
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/components/upload/nz-upload-btn.component.ts b/src/components/upload/nz-upload-btn.component.ts
@@ -1,5 +1,5 @@
 // tslint:disable:no-any ordered-imports
-import { Component, ViewChild, ElementRef, HostListener, OnInit, OnChanges, OnDestroy, SimpleChange, SimpleChanges, ChangeDetectorRef, Input, Renderer2 } from '@angular/core';
+import { Component, ViewChild, ElementRef, HostListener, OnInit, OnChanges, OnDestroy, SimpleChange, SimpleChanges, ChangeDetectorRef, Input, Renderer2, Optional } from '@angular/core';
 import { HttpClient, HttpRequest, HttpEventType, HttpResponse, HttpHeaders } from '@angular/common/http';
 import { Observable } from 'rxjs/Observable';
 import { Subscription } from 'rxjs/Subscription';
@@ -223,7 +223,9 @@ export class NzUploadBtnComponent implements OnInit, OnChanges, OnDestroy {
   }
   // endregion
 
-  constructor(private http: HttpClient, private _el: ElementRef, private _renderer: Renderer2, private cd: ChangeDetectorRef) {}
+  constructor(@Optional() private http: HttpClient, private _el: ElementRef, private _renderer: Renderer2, private cd: ChangeDetectorRef) {
+    if (!http) throw new Error(`Not found 'HttpClient', You can import 'HttpClientModel' in your root module.`);
+  }
 
   ngOnInit(): void {
     this.inited = true;

diff --git a/src/components/upload/nz-upload.module.ts b/src/components/upload/nz-upload.module.ts
@@ -1,5 +1,4 @@
 import { CommonModule } from '@angular/common';
-import { HttpClientModule } from '@angular/common/http';
 import { ModuleWithProviders, NgModule } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { NzLocaleModule } from '../locale/index';
@@ -10,7 +9,7 @@ import { NzUploadListComponent } from './nz-upload-list.component';
 import { NzUploadComponent } from './nz-upload.component';
 
 @NgModule({
-  imports:      [CommonModule, FormsModule, HttpClientModule, NzToolTipModule, NzProgressModule, NzLocaleModule],
+  imports:      [CommonModule, FormsModule, NzToolTipModule, NzProgressModule, NzLocaleModule],
   declarations: [NzUploadComponent, NzUploadBtnComponent, NzUploadListComponent],
   exports:      [NzUploadComponent]
 })

diff --git a/src/components/upload/nz-upload.spec.ts b/src/components/upload/nz-upload.spec.ts
@@ -2,6 +2,7 @@
 import { TestBed, ComponentFixture, fakeAsync, tick } from '@angular/core/testing';
 import { Component, Injector, ViewChild, DebugElement } from '@angular/core';
 import { By } from '@angular/platform-browser';
+import { HttpClientModule } from '@angular/common/http';
 import { NzLocaleModule } from '../locale/nz-locale.module';
 import { NzUploadModule } from './nz-upload.module';
 import { NzUploadComponent } from './nz-upload.component';
@@ -12,7 +13,7 @@ describe('NzUpload', () => {
   let instance: TestComponent;
   beforeEach(() => {
     TestBed.configureTestingModule({
-      imports: [ NzUploadModule ],
+      imports: [ HttpClientModule, NzUploadModule ],
       declarations: [ TestComponent ]
     });
     fixture = TestBed.createComponent(TestComponent);