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

Commit 2c15b45

Browse files
FredericEspiauAxelPeter
authored andcommitted
feat(oui-navbar): allow html in navbar links (#330)
1 parent 55b76d4 commit 2c15b45

File tree

4 files changed

+13
-11
lines changed

4 files changed

+13
-11
lines changed

packages/oui-navbar/README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
links="asideLink.subLinks"
5454
limit-to="asideLink.limitTo"
5555
header-template="asideLink.headerTemplate"
56-
header-title="{{asideLink.title}}"
56+
header-title="{{asideLink.headerTitle}}"
5757
footer-template="asideLink.footerTemplate"
5858
footer-title="{{asideLink.footerTitle}}"
5959
footer-href="{{asideLink.footerUrl}}"
@@ -69,7 +69,7 @@
6969
<oui-navbar-menu ng-switch-default
7070
header-class="oui-navbar_mobile-only"
7171
header-breadcrumb="{{asideLink.headerBreadcrumb}}"
72-
header-title="{{asideLink.title}}"
72+
header-title="{{asideLink.headerTitle}}"
7373
name="{{asideLink.name}}"
7474
links="asideLink.subLinks"
7575
align="end"
@@ -391,7 +391,7 @@ This property is only available for root links of `aside-links`.
391391
links="asideLink.subLinks"
392392
limit-to="asideLink.limitTo"
393393
header-template="asideLink.headerTemplate"
394-
header-title="{{asideLink.title}}"
394+
header-title="{{asideLink.headerTitle}}"
395395
footer-template="asideLink.footerTemplate"
396396
footer-title="{{asideLink.footerTitle}}"
397397
footer-href="{{asideLink.footerUrl}}"
@@ -407,7 +407,7 @@ This property is only available for root links of `aside-links`.
407407
<oui-navbar-menu ng-switch-default
408408
header-class="oui-navbar_mobile-only"
409409
header-breadcrumb="{{asideLink.headerBreadcrumb}}"
410-
header-title="{{asideLink.title}}"
410+
header-title="{{asideLink.headerTitle}}"
411411
name="{{asideLink.name}}"
412412
links="asideLink.subLinks"
413413
align="end"
@@ -486,7 +486,7 @@ subLinks = [];
486486
name="{{$ctrl.placeholderNotification[0].name}}"
487487
links="$ctrl.placeholderNotification[0].subLinks"
488488
limit-to="$ctrl.placeholderNotification[0].limitTo"
489-
header-title="{{$ctrl.placeholderNotification[0].title}}"
489+
header-title="{{$ctrl.placeholderNotification[0].headerTitle}}"
490490
align="end"
491491
fixed></oui-navbar-notification>
492492
</oui-navbar-dropdown>

packages/oui-navbar/src/dropdown/navbar-dropdown.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@
1515
ng-bind="$ctrl.iconBadge">
1616
</span>
1717
</span>
18-
<span ng-bind="::$ctrl.text"></span>
18+
<span ng-bind-html="::$ctrl.text"></span>
1919
</button>
2020
<div class="oui-navbar-menu__wrapper" ng-transclude></div>

packages/oui-navbar/src/index.spec.data.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@
4141
{
4242
"name": "notifications",
4343
"class": "navbar-notification__list",
44-
"title": "Notifications",
44+
"title": "<div class=\"oui-color-gothic\">Your</div><span>notifications</span>",
45+
"headerTitle": "Your notifications",
4546
"iconClass": "oui-icon oui-icon-info_circle",
4647
"iconAnimated": true,
4748
"subLinks": [
@@ -84,7 +85,8 @@
8485
},
8586
{
8687
"name": "libero",
87-
"title": "Libero",
88+
"title": "<div class=\"oui-color-gothic\">Need</div><span>help</span>",
89+
"headerTitle": "Need help",
8890
"iconClass": "oui-icon oui-icon-help_circle",
8991
"subLinks": [
9092
{
@@ -125,7 +127,7 @@
125127
},
126128
{
127129
"name": "user",
128-
"title": "User",
130+
"title": "<div class=\"oui-color-text_oui-color-gothic\">Hello Username</div><span>your account</span>",
129131
"iconClass": "oui-icon oui-icon-info_circle",
130132
"subLinks": [
131133
{

packages/oui-navbar/src/link/navbar-link.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
'oui-navbar-link_tertiary': $ctrl.variant === 'tertiary'
1010
}"
1111
ng-href="{{::$ctrl.href}}"
12-
ng-bind="::$ctrl.text"
12+
ng-bind-html="::$ctrl.text"
1313
ng-click="$ctrl.onClick()">
1414
</a>
1515
<a class="oui-navbar-link"
@@ -22,7 +22,7 @@
2222
'oui-navbar-link_secondary': $ctrl.variant === 'secondary',
2323
'oui-navbar-link_tertiary': $ctrl.variant === 'tertiary'
2424
}"
25-
ng-bind="::$ctrl.text"
25+
ng-bind-html="::$ctrl.text"
2626
ui-sref="{{::$ctrl.getFullSref()}}"
2727
ui-sref-active="oui-navbar-link_active"
2828
ng-click="$ctrl.onClick()">

0 commit comments

Comments
 (0)