From 66c9cb30e0c12b457af6096ff910947ff98decf9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=89=A7=E8=A1=A1?= <yadong.xyd@alibaba-inc.com>
Date: Wed, 6 Jun 2018 11:56:59 +0800
Subject: [PATCH] fix(module:popover): fix popover nzTemplate value

---
 components/popover/nz-popover.component.ts | 3 +--
 package.json                               | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/components/popover/nz-popover.component.ts b/components/popover/nz-popover.component.ts
index cad4eea8875..da34bdc4290 100644
--- a/components/popover/nz-popover.component.ts
+++ b/components/popover/nz-popover.component.ts
@@ -1,7 +1,6 @@
 import {
   Component,
   ContentChild,
-  Input,
   TemplateRef
 } from '@angular/core';
 import { fadeAnimation } from '../core/animation/fade-animations';
@@ -20,6 +19,6 @@ import { NzToolTipComponent } from '../tooltip/nz-tooltip.component';
 })
 export class NzPopoverComponent extends NzToolTipComponent {
   _prefix = 'ant-popover-placement';
-  _title: string | TemplateRef<void>;
+  @ContentChild('neverUsedTemplate') _title: string | TemplateRef<void>; // used to remove NzToolTipComponent @ContentChild('nzTemplate')
   @ContentChild('nzTemplate') _content: string | TemplateRef<void>;
 }
diff --git a/package.json b/package.json
index a8fe7a77af7..7d3a92eeb23 100644
--- a/package.json
+++ b/package.json
@@ -82,7 +82,7 @@
     "karma-cli": "~1.0.1",
     "marked": "^0.3.6",
     "node-prismjs": "^0.1.1",
-    "ngx-color": "^1.2.1",
+    "ngx-color": "^1.5.2",
     "prismjs": "^1.10.0",
     "remark": "^8.0.0",
     "rollup": "^0.49.2",