From 8a031036fed47ed464befc5707be68e8b1ee60e6 Mon Sep 17 00:00:00 2001
From: John Ryan Camatog <john.ryan.camatog@gmail.com>
Date: Thu, 22 Jun 2017 03:13:20 +0800
Subject: [PATCH] Small enhancements

- Fix lingering white border on `md-input-container` buttons (`md-has-password`/`md-clearable`)
- Fix `md-table` sort type not defaulting to 'asc' when `md-sort` prop is set
- Add `md-iconset` support to md-tab (fixes #704)
---
 src/components/mdInputContainer/mdInputContainer.theme | 4 ----
 src/components/mdTable/mdTableHead.vue                 | 2 +-
 src/components/mdTabs/mdTab.vue                        | 5 +++++
 src/components/mdTabs/mdTabs.vue                       | 8 +++++++-
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/mdInputContainer/mdInputContainer.theme b/src/components/mdInputContainer/mdInputContainer.theme
index bc544e1..3b89b54 100644
--- a/src/components/mdInputContainer/mdInputContainer.theme
+++ b/src/components/mdInputContainer/mdInputContainer.theme
@@ -57,9 +57,5 @@
         color: #{'BACKGROUND-CONTRAST-0.38'};
       }
     }
-
-    .md-icon:not(.md-icon-delete):after {
-      background: #{'BACKGROUND-COLOR'};
-    }
   }
 }
diff --git a/src/components/mdTable/mdTableHead.vue b/src/components/mdTable/mdTableHead.vue
index edb084f..20fc782 100644
--- a/src/components/mdTable/mdTableHead.vue
+++ b/src/components/mdTable/mdTableHead.vue
@@ -68,7 +68,7 @@
       initSort() {
         if (this.hasMatchSort()) {
           this.sorted = true;
-          this.sortType = this.parentTable.sortType;
+          this.sortType = this.parentTable.sortType || 'asc';
         }
       }
     },
diff --git a/src/components/mdTabs/mdTab.vue b/src/components/mdTabs/mdTab.vue
index 45325c8..6d29253 100644
--- a/src/components/mdTabs/mdTab.vue
+++ b/src/components/mdTabs/mdTab.vue
@@ -14,6 +14,7 @@
       id: [String, Number],
       mdLabel: [String, Number],
       mdIcon: String,
+      mdIconset: String,
       mdActive: Boolean,
       mdDisabled: Boolean,
       mdOptions: {
@@ -47,6 +48,9 @@
       mdIcon() {
         this.updateTabData();
       },
+      mdIconset() {
+        this.updateTabData();
+      },
       mdOptions: {
         deep: true,
         handler() {
@@ -80,6 +84,7 @@
           id: this.tabId,
           label: this.mdLabel,
           icon: this.mdIcon,
+          iconset: this.mdIconset,
           options: this.mdOptions,
           active: this.mdActive,
           disabled: this.mdDisabled,
diff --git a/src/components/mdTabs/mdTabs.vue b/src/components/mdTabs/mdTabs.vue
index d1333df..08c7d93 100644
--- a/src/components/mdTabs/mdTabs.vue
+++ b/src/components/mdTabs/mdTabs.vue
@@ -13,9 +13,13 @@
             @click="setActiveTab(header)"
             ref="tabHeader">
             <md-ink-ripple :md-disabled="header.disabled"></md-ink-ripple>
+
             <div class="md-tab-header-container">
               <md-icon v-if="header.icon">{{ header.icon }}</md-icon>
+              <md-icon v-else-if="header.iconset" :md-iconset="header.iconset">{{ header.icon }}</md-icon>
+
               <span v-if="header.label">{{ header.label }}</span>
+
               <md-tooltip v-if="header.tooltip" :md-direction="header.tooltipDirection" :md-delay="header.tooltipDelay">{{ header.tooltip }}</md-tooltip>
             </div>
           </button>
@@ -23,9 +27,11 @@
           <span class="md-tab-indicator" :class="indicatorClasses" ref="indicator"></span>
         </div>
       </div>
+
       <button v-if="mdNavigation && hasNavigationScroll" @click="navigationScrollLeft" class="md-tab-header-navigation-button md-left" :class="navigationLeftButtonClasses">
         <md-icon>keyboard_arrow_left</md-icon>
       </button>
+
       <button v-if="mdNavigation && hasNavigationScroll" @click="navigationScrollRight" class="md-tab-header-navigation-button md-right" :class="navigationRightButtonClasses">
         <md-icon>keyboard_arrow_right</md-icon>
       </button>
@@ -251,7 +257,7 @@
         this.hasNavigationScroll = scrollWidth > clientWidth;
       },
       setActiveTab(tabData) {
-        this.hasIcons = !!tabData.icon;
+        this.hasIcons = !!tabData.icon || !!tabData.iconset;
         this.hasLabel = !!tabData.label;
         this.activeTab = tabData.id;
         this.activeTabNumber = this.getTabIndex(this.activeTab);