From 705325c70ae916821dabd70019df974148ddab47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E5=A5=95?=
 <Leopoldthecoder@users.noreply.github.com>
Date: Tue, 28 Feb 2017 16:30:08 +0800
Subject: [PATCH] Popup: prepare for the upcoming change of Vue 2.2.0 (#3067)

---
 src/utils/popup/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/popup/index.js b/src/utils/popup/index.js
index dbecb810..a71da816 100644
--- a/src/utils/popup/index.js
+++ b/src/utils/popup/index.js
@@ -144,7 +144,7 @@ export default {
         this.$emit('input', true);
       }
 
-      const props = merge({}, this, options);
+      const props = merge({}, this.$props || this, options);
 
       if (this._closeTimer) {
         clearTimeout(this._closeTimer);