Skip to content
This repository was archived by the owner on Aug 7, 2020. It is now read-only.

Commit 56745d7

Browse files
committed
fix(oui-header-tabs): set as button when no href
Signed-off-by: Axel Peter <axel.peter@live.com>
1 parent 901cd14 commit 56745d7

File tree

2 files changed

+23
-12
lines changed

2 files changed

+23
-12
lines changed

packages/oui-header-tabs/README.md

+2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
<oui-header-tabs-item text="Header Tabs" href="/#!/oui-angular/header-tabs" active></oui-header-tabs-item>
1414
<oui-header-tabs-item text="Pagination" href="/#!/oui-angular/pagination"></oui-header-tabs-item>
1515
<oui-header-tabs-item text="Datagrid" href="/#!/oui-angular/datagrid"></oui-header-tabs-item>
16+
<oui-header-tabs-item text="Button"></oui-header-tabs-item>
1617
</oui-header-tabs>
1718
```
1819

@@ -28,6 +29,7 @@
2829
<oui-header-tabs-divider></oui-header-tabs-divider>
2930
<oui-header-tabs-item text="Select" href="/#!/oui-angular/select"></oui-header-tabs-item>
3031
<oui-header-tabs-item text="Select Picker" href="/#!/oui-angular/select-picker"></oui-header-tabs-item>
32+
<oui-header-tabs-item text="Button"></oui-header-tabs-item>
3133
</oui-header-tabs-dropdown>
3234
<oui-header-tabs-dropdown text="Datagrid">
3335
<oui-header-tabs-item text="Datagrid" href="/#!/oui-angular/datagrid"></oui-header-tabs-item>
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,30 @@
11
<div class="oui-header-tabs__item" role="listitem"
22
ui-sref-active="oui-header-tabs__item_active"
33
ng-class="{ 'oui-header-tabs__item_active': $ctrl.active, 'oui-header-tabs__item_disabled': $ctrl.disabled }">
4-
<a ng-attr-rel="{{::$ctrl.linkRel}}"
5-
ng-attr-target="{{::$ctrl.linkTarget}}"
6-
ng-href="{{::$ctrl.href}}"
7-
ng-if="!!$ctrl.href && !$ctrl.disabled"
8-
ng-click="$ctrl.onClick()">
4+
<button class="oui-header-tabs__action"
5+
ng-bind="::$ctrl.text"
6+
ng-click="$ctrl.onClick()"
7+
ng-if="!$ctrl.href && !$ctrl.state && !$ctrl.disabled">
8+
</button>
9+
<a class="oui-header-tabs__action"
10+
ng-attr-rel="{{::$ctrl.linkRel}}"
11+
ng-attr-target="{{::$ctrl.linkTarget}}"
12+
ng-href="{{::$ctrl.href}}"
13+
ng-if="!!$ctrl.href && !$ctrl.disabled"
14+
ng-click="$ctrl.onClick()">
915
<span ng-bind="::$ctrl.text"></span>
1016
<span class="oui-icon oui-icon-external_link" aria-hidden="true"
11-
ng-if="::$ctrl.external">
17+
ng-if="::$ctrl.external">
1218
</span>
1319
</a>
14-
<a ng-bind="::$ctrl.text"
15-
ng-click="$ctrl.onClick()"
16-
ng-if="!!$ctrl.state && !$ctrl.disabled"
17-
ui-sref="{{::$ctrl.getFullSref()}}">
20+
<a class="oui-header-tabs__action"
21+
ng-bind="::$ctrl.text"
22+
ng-click="$ctrl.onClick()"
23+
ng-if="!!$ctrl.state && !$ctrl.disabled"
24+
ui-sref="{{::$ctrl.getFullSref()}}">
1825
</a>
19-
<span ng-bind="::$ctrl.text"
20-
ng-if="!!$ctrl.disabled"></span>
26+
<span class="oui-header-tabs__action"
27+
ng-bind="::$ctrl.text"
28+
ng-if="!!$ctrl.disabled">
29+
</span>
2130
</div>

0 commit comments

Comments
 (0)