From c0db4e8bdd6fc5910f3ca6d26f29d97ff71b243a Mon Sep 17 00:00:00 2001
From: baiyaaaaa <bigpet1991@gmail.com>
Date: Wed, 12 Oct 2016 17:27:41 +0800
Subject: [PATCH] fix dynamic input type bug

---
 examples/docs/zh-cn/input.md        | 2 +-
 package.json                        | 2 +-
 packages/date-picker/src/picker.vue | 6 +-----
 packages/input/src/input.vue        | 2 +-
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/examples/docs/zh-cn/input.md b/examples/docs/zh-cn/input.md
index 57d14e3a1..0f7ddcc31 100644
--- a/examples/docs/zh-cn/input.md
+++ b/examples/docs/zh-cn/input.md
@@ -627,7 +627,7 @@
 
 | 参数          | 说明            | 类型            | 可选值                 | 默认值   |
 |-------------  |---------------- |---------------- |---------------------- |-------- |
-| type         | 同原生的 input 的 type 属性，另外提供 type="textarea"   | string  | — | — |
+| type         | 类型   | string  | text/textarea | text |
 | value         | 绑定值           | string, number  | — | — |
 | maxlength     | 最大输入长度      | number          |  —  | — |
 | minlength     | 最小输入长度      | number          | — | — |
diff --git a/package.json b/package.json
index 6d56b11c9..3d96d046d 100644
--- a/package.json
+++ b/package.json
@@ -71,7 +71,7 @@
     "theaterjs": "^3.0.0",
     "uppercamelcase": "^1.1.0",
     "url-loader": "^0.5.7",
-    "vue": "^2.0.1",
+    "vue": "^2.0.2",
     "vue-loader": "^9.5.1",
     "vue-markdown-loader": "^0.5.1",
     "vue-popup": "^0.2.7",
diff --git a/packages/date-picker/src/picker.vue b/packages/date-picker/src/picker.vue
index 083dc9fee..3d0b72750 100644
--- a/packages/date-picker/src/picker.vue
+++ b/packages/date-picker/src/picker.vue
@@ -11,7 +11,7 @@
     <input
       class="el-date-editor__editor"
       :readonly="readonly"
-      :type="editorType"
+      type="text"
       :placeholder="placeholder"
       @focus="handleFocus"
       @blur="handleBlur"
@@ -274,10 +274,6 @@ export default {
         }
         this.$emit('input', value);
       }
-    },
-
-    editorType() {
-      return 'text';
     }
   },
 
diff --git a/packages/input/src/input.vue b/packages/input/src/input.vue
index a2c7bd6e7..28d8e705f 100644
--- a/packages/input/src/input.vue
+++ b/packages/input/src/input.vue
@@ -15,7 +15,7 @@
       <input
         class="el-input__inner"
         v-model="currentValue"
-        :type="type"
+        type="text"
         :name="name"
         :placeholder="placeholder"
         :disabled="disabled"