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

Commit 2fec90d

Browse files
AxelPeterAxelPeter
authored
Merge pull request #331 from ovh-ux/master
Sync master to develop
2 parents 076b274 + dc8f046 commit 2fec90d

File tree

10 files changed

+77
-21
lines changed

10 files changed

+77
-21
lines changed

‎CHANGELOG.md‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,37 @@
1+
<a name="2.23.0"></a>
2+
# [2.23.0](https://github.com/ovh-ux/ovh-ui-angular/compare/v2.22.2...v2.23.0) (2018-12-11)
3+
4+
5+
### Bug Fixes
6+
7+
* **oui-checkbox:** fix error class display condition ([#320](https://github.com/ovh-ux/ovh-ui-angular/issues/320)) ([9ce4b1c](https://github.com/ovh-ux/ovh-ui-angular/commit/9ce4b1c))
8+
* **oui-select-picker:** fix transclude with component instead of span ([#312](https://github.com/ovh-ux/ovh-ui-angular/issues/312)) ([3a7ad05](https://github.com/ovh-ux/ovh-ui-angular/commit/3a7ad05))
9+
10+
11+
### Features
12+
13+
* **oui-autocomplete:** add oui-autocomplete directive ([#315](https://github.com/ovh-ux/ovh-ui-angular/issues/315)) ([a0a5183](https://github.com/ovh-ux/ovh-ui-angular/commit/a0a5183))
14+
* **oui-checkbox:** add error class when checkbox is in error ([#314](https://github.com/ovh-ux/ovh-ui-angular/issues/314)) ([e08dc8f](https://github.com/ovh-ux/ovh-ui-angular/commit/e08dc8f))
15+
* **oui-datagrid:** add on-row-select event ([#323](https://github.com/ovh-ux/ovh-ui-angular/issues/323)) ([98c6154](https://github.com/ovh-ux/ovh-ui-angular/commit/98c6154))
16+
* **oui-dual-list:** add dual-list component ([#311](https://github.com/ovh-ux/ovh-ui-angular/issues/311)) ([2eb2013](https://github.com/ovh-ux/ovh-ui-angular/commit/2eb2013))
17+
* **oui-file:** add file component ([#324](https://github.com/ovh-ux/ovh-ui-angular/issues/324)) ([b50ac81](https://github.com/ovh-ux/ovh-ui-angular/commit/b50ac81))
18+
* **oui-navbar:** allow html in navbar links ([#330](https://github.com/ovh-ux/ovh-ui-angular/issues/330)) ([2c15b45](https://github.com/ovh-ux/ovh-ui-angular/commit/2c15b45))
19+
* **oui-radio:** add variant attribute ([#325](https://github.com/ovh-ux/ovh-ui-angular/issues/325)) ([3e78cb9](https://github.com/ovh-ux/ovh-ui-angular/commit/3e78cb9))
20+
* **oui-stepper:** add position attribute ([#313](https://github.com/ovh-ux/ovh-ui-angular/issues/313)) ([88aeedd](https://github.com/ovh-ux/ovh-ui-angular/commit/88aeedd))
21+
* **oui-tabs:** add tabs component ([#319](https://github.com/ovh-ux/ovh-ui-angular/issues/319)) ([727454a](https://github.com/ovh-ux/ovh-ui-angular/commit/727454a))
22+
23+
24+
25+
<a name="2.22.2"></a>
26+
## [2.22.2](https://github.com/ovh-ux/ovh-ui-angular/compare/v2.22.1...v2.22.2) (2018-11-23)
27+
28+
29+
### Bug Fixes
30+
31+
* **oui-datagrid:** fix empty td when selectable-rows is active ([#321](https://github.com/ovh-ux/ovh-ui-angular/issues/321)) ([0ddeed0](https://github.com/ovh-ux/ovh-ui-angular/commit/0ddeed0))
32+
33+
34+
135
<a name="2.22.1"></a>
236
## [2.22.1](https://github.com/ovh-ux/ovh-ui-angular/compare/v2.22.0...v2.22.1) (2018-11-16)
337

‎dist/oui-angular.min.js‎

Lines changed: 25 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/oui-angular.min.js.map‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"description": "A set of maintainable components for the OVH ecosystem (Angular).",
44
"license": "BSD-3-Clause",
55
"author": "OVH SAS",
6-
"version": "2.22.1",
6+
"version": "2.23.0",
77
"keywords": [
88
"angular"
99
],
@@ -51,8 +51,8 @@
5151
"devDependencies": {
5252
"angular": ">=1.6.x",
5353
"angular-aria": ">=1.6.x",
54-
"angular-sanitize": ">=1.6.x",
5554
"angular-mocks": ">=1.6.x",
55+
"angular-sanitize": ">=1.6.x",
5656
"babel-cli": "^6.26.0",
5757
"babel-core": "^6.26.3",
5858
"babel-eslint": "^9.0.0",

‎packages/oui-datagrid/src/datagrid.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
<tbody class="oui-datagrid__body"
8989
ng-show="!$ctrl.displayedRows.length || $ctrl.loading || $ctrl.firstLoading">
9090
<tr class="oui-datagrid__row oui-datagrid__row_loading">
91-
<td ng-if="$ctrl.hasCheckboxes"
91+
<td ng-if="$ctrl.selectableRows"
9292
class="oui-datagrid__cell oui-datagrid__cell-sticky"></td>
9393
<td class="oui-datagrid__cell"
9494
ng-attr-colspan="{{ $ctrl.columns.length }}"

‎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()">

‎packages/oui-select/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
"license": "BSD-3-Clause",
66
"author": "OVH SAS",
77
"dependencies": {
8-
"popper.js": "^1.14.4"
8+
"ui-select": "^0.19.8"
99
}
1010
}

0 commit comments

Comments
 (0)