Popup: prepare for the upcoming change of Vue 2.2.0 (#3067)

705325c7 · 杨奕 · baiyaaaaa · ae8ab4b5 · 705325c7
Commit 705325c7 authored Feb 28, 2017 by 杨奕 Committed by baiyaaaaa Feb 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

src/utils/popup/index.js src/utils/popup/index.js +1 -1

No files found.
--- 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);