From e2be799e6d7ba1684de4b83b618701aa73b693c5 Mon Sep 17 00:00:00 2001
From: Leopoldthecoder <Leopoldthecuber@gmail.com>
Date: Wed, 4 Oct 2017 20:44:56 +0800
Subject: [PATCH] Button: fix disabled attribute

---
 examples/components/theme-picker.vue | 2 +-
 packages/button/src/button.vue       | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/examples/components/theme-picker.vue b/examples/components/theme-picker.vue
index 0f9ceaf1..7b1be130 100644
--- a/examples/components/theme-picker.vue
+++ b/examples/components/theme-picker.vue
@@ -97,7 +97,7 @@
           let green = parseInt(color.slice(2, 4), 16);
           let blue = parseInt(color.slice(4, 6), 16);
 
-          if (tint === 0) {
+          if (tint === 0) { // when primary color is in its rgb space
             return [red, green, blue].join(',');
           } else {
             red += Math.round(tint * (255 - red));
diff --git a/packages/button/src/button.vue b/packages/button/src/button.vue
index b3cd56a3..6872f340 100644
--- a/packages/button/src/button.vue
+++ b/packages/button/src/button.vue
@@ -2,6 +2,8 @@
   <button
     class="el-button"
     @click="handleClick"
+    :disabled="disabled"
+    :autofocus="autofocus"
     :type="nativeType"
     :class="[
       type ? 'el-button--' + type : '',