File tree Expand file tree Collapse file tree 4 files changed +13
-6
lines changed Expand file tree Collapse file tree 4 files changed +13
-6
lines changed Original file line number Diff line number Diff line change 57
57
color: #{'BACKGROUND-CONTRAST-0.38'};
58
58
}
59
59
}
60
-
61
- .md-icon:not(.md-icon-delete):after {
62
- background: #{'BACKGROUND-COLOR'};
63
- }
64
60
}
65
61
}
Original file line number Diff line number Diff line change 68
68
initSort () {
69
69
if (this .hasMatchSort ()) {
70
70
this .sorted = true ;
71
- this .sortType = this .parentTable .sortType ;
71
+ this .sortType = this .parentTable .sortType || ' asc ' ;
72
72
}
73
73
}
74
74
},
Original file line number Diff line number Diff line change 14
14
id: [String , Number ],
15
15
mdLabel: [String , Number ],
16
16
mdIcon: String ,
17
+ mdIconset: String ,
17
18
mdActive: Boolean ,
18
19
mdDisabled: Boolean ,
19
20
mdOptions: {
47
48
mdIcon () {
48
49
this .updateTabData ();
49
50
},
51
+ mdIconset () {
52
+ this .updateTabData ();
53
+ },
50
54
mdOptions: {
51
55
deep: true ,
52
56
handler () {
80
84
id: this .tabId ,
81
85
label: this .mdLabel ,
82
86
icon: this .mdIcon ,
87
+ iconset: this .mdIconset ,
83
88
options: this .mdOptions ,
84
89
active: this .mdActive ,
85
90
disabled: this .mdDisabled ,
Original file line number Diff line number Diff line change 13
13
@click =" setActiveTab(header)"
14
14
ref =" tabHeader" >
15
15
<md-ink-ripple :md-disabled =" header.disabled" ></md-ink-ripple >
16
+
16
17
<div class =" md-tab-header-container" >
17
18
<md-icon v-if =" header.icon" >{{ header.icon }}</md-icon >
19
+ <md-icon v-else-if =" header.iconset" :md-iconset =" header.iconset" >{{ header.icon }}</md-icon >
20
+
18
21
<span v-if =" header.label" >{{ header.label }}</span >
22
+
19
23
<md-tooltip v-if =" header.tooltip" :md-direction =" header.tooltipDirection" :md-delay =" header.tooltipDelay" >{{ header.tooltip }}</md-tooltip >
20
24
</div >
21
25
</button >
22
26
23
27
<span class =" md-tab-indicator" :class =" indicatorClasses" ref =" indicator" ></span >
24
28
</div >
25
29
</div >
30
+
26
31
<button v-if =" mdNavigation && hasNavigationScroll" @click =" navigationScrollLeft" class =" md-tab-header-navigation-button md-left" :class =" navigationLeftButtonClasses" >
27
32
<md-icon >keyboard_arrow_left</md-icon >
28
33
</button >
34
+
29
35
<button v-if =" mdNavigation && hasNavigationScroll" @click =" navigationScrollRight" class =" md-tab-header-navigation-button md-right" :class =" navigationRightButtonClasses" >
30
36
<md-icon >keyboard_arrow_right</md-icon >
31
37
</button >
251
257
this .hasNavigationScroll = scrollWidth > clientWidth;
252
258
},
253
259
setActiveTab (tabData ) {
254
- this .hasIcons = !! tabData .icon ;
260
+ this .hasIcons = !! tabData .icon || !! tabData . iconset ;
255
261
this .hasLabel = !! tabData .label ;
256
262
this .activeTab = tabData .id ;
257
263
this .activeTabNumber = this .getTabIndex (this .activeTab );
You can’t perform that action at this time.
0 commit comments