Skip to content

Commit 247d61d

Browse files
committed
Add uib prefixes in accordance to migration guide
Migrate deprecated `angular-ui-bootstrap` usage to new `uib`-prefixed versions. Most of the changes apply to dropdowns, modals and tooltips. Also remove classes and aria attributes that are added during link phase for dropdown directives. Tested against latest ManageIQ Service UI and was not able to locate any issues. https://github.com/angular-ui/bootstrap/wiki/Migration-guide-for-prefixes
1 parent 7ed37ca commit 247d61d

File tree

17 files changed

+98
-86
lines changed

17 files changed

+98
-86
lines changed

src/card/basic/card-filter.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
1+
<button type="button" uib-dropdown-toggle class="btn btn-default">
22
{{currentFilter.label}}
33
<span class="caret"></span>
44
</button>
5-
<ul class="dropdown-menu dropdown-menu-right" role="menu">
5+
<ul uib-dropdown-menu class="dropdown-menu-right" role="menu">
66
<li ng-repeat="item in filter.filters" ng-class="{'selected': item === currentFilter}">
77
<a role="menuitem" tabindex="-1" ng-click="filterCallBackFn(item)">
88
{{item.label}}

src/card/basic/card.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div ng-class="showTopBorder === 'true' ? 'card-pf card-pf-accented' : 'card-pf'">
22
<div ng-if="showHeader()" ng-class="shouldShowTitlesSeparator ? 'card-pf-heading' : 'card-pf-heading-no-bottom'">
3-
<div ng-if="showFilterInHeader()" class="dropdown card-pf-time-frame-filter">
3+
<div ng-if="showFilterInHeader()" uib-dropdown class="card-pf-time-frame-filter">
44
<div ng-include="'card/basic/card-filter.html'"></div>
55
</div>
66
<h2 class="card-pf-title">{{headTitle}}</h2>
@@ -12,7 +12,7 @@ <h2 class="card-pf-title">{{headTitle}}</h2>
1212
<div ng-transclude></div>
1313
</div>
1414
<div ng-if="footer" class="card-pf-footer">
15-
<div ng-if="showFilterInFooter()" class="dropdown card-pf-time-frame-filter">
15+
<div ng-if="showFilterInFooter()" uib-dropdown class="card-pf-time-frame-filter">
1616
<div ng-include="'card/basic/card-filter.html'"></div>
1717
</div>
1818
<p>

src/charts/utilization-bar/utilization-bar-chart.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<div class="progress progress-label-top-right" ng-if="chartData.dataAvailable !== false">
55
<div class="progress-bar" aria-valuenow="{{chartData.percentageUsed}}" aria-valuemin="0" aria-valuemax="100" ng-class="{'animate': animate,
66
'progress-bar-success': isOk, 'progress-bar-danger': isError, 'progress-bar-warning': isWarn}"
7-
ng-style="{width:chartData.percentageUsed + '%'}" tooltip="{{chartData.percentageUsed}}% Used" >
7+
ng-style="{width:chartData.percentageUsed + '%'}" uib-tooltip="{{chartData.percentageUsed}}% Used" >
88
<span ng-if="chartFooter" ng-bind-html="chartFooter"></span>
99
<span ng-if="!chartFooter && (!footerLabelFormat || footerLabelFormat === 'actual')"><strong>{{chartData.used}} of {{chartData.total}} {{units}}</strong> Used</span>
1010
<span ng-if="!chartFooter && footerLabelFormat === 'percent'"><strong>{{chartData.percentageUsed}}%</strong> Used</span>
1111
</div>
1212
<div class="progress-bar progress-bar-remaining"
13-
ng-style="{width:(100 - chartData.percentageUsed) + '%'}" tooltip="{{100 - chartData.percentageUsed}}% Available">
13+
ng-style="{width:(100 - chartData.percentageUsed) + '%'}" uib-tooltip="{{100 - chartData.percentageUsed}}% Available">
1414
</div>
1515
</div>
1616
</span>
@@ -21,13 +21,13 @@
2121
<div class="progress" ng-if="chartData.dataAvailable !== false">
2222
<div class="progress-bar" aria-valuenow="{{chartData.percentageUsed}}" aria-valuemin="0" aria-valuemax="100"
2323
ng-class="{'animate': animate, 'progress-bar-success': isOk, 'progress-bar-danger': isError, 'progress-bar-warning': isWarn}"
24-
ng-style="{width:chartData.percentageUsed + '%'}" tooltip="{{chartData.percentageUsed}}% Used">
24+
ng-style="{width:chartData.percentageUsed + '%'}" uib-tooltip="{{chartData.percentageUsed}}% Used">
2525
<span ng-if="chartFooter" ng-bind-html="chartFooter"></span>
2626
<span ng-if="(!chartFooter) && (!footerLabelFormat || footerLabelFormat === 'actual')" ng-style="{'max-width':layout.footerLabelWidth}"><strong>{{chartData.used}} {{units}}</strong> Used</span>
2727
<span ng-if="(!chartFooter) && footerLabelFormat === 'percent'" ng-style="{'max-width':layout.footerLabelWidth}"><strong>{{chartData.percentageUsed}}%</strong> Used</span>
2828
</div>
2929
<div class="progress-bar progress-bar-remaining"
30-
ng-style="{width:(100 - chartData.percentageUsed) + '%'}" tooltip="{{100 - chartData.percentageUsed}}% Available">
30+
ng-style="{width:(100 - chartData.percentageUsed) + '%'}" uib-tooltip="{{100 - chartData.percentageUsed}}% Available">
3131
</div>
3232
</div>
3333
</div>

src/filters/filter-fields.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
<form>
33
<div class="form-group toolbar-pf-filter">
44
<div class="input-group">
5-
<div dropdown class="input-group-btn">
6-
<button dropdown-toggle type="button" class="btn btn-default dropdown-toggle filter-fields" aria-haspopup="true" aria-expanded="false" tooltip="Filter by" tooltip-placement="top">
5+
<div uib-dropdown class="input-group-btn">
6+
<button uib-dropdown-toggle type="button" class="btn btn-default filter-fields" uib-tooltip="Filter by" tooltip-placement="top">
77
{{currentField.title}}
88
<span class="caret"></span>
99
</button>
10-
<ul class="dropdown-menu">
10+
<ul uib-dropdown-menu>
1111
<li ng-repeat="item in config.fields">
1212
<a class="filter-field" role="menuitem" tabindex="-1" ng-click="selectField(item)">
1313
{{item.title}}

src/modals/about-modal.directive.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,32 +78,32 @@ angular.module('patternfly.modals')
7878
},
7979
templateUrl: 'modals/about-modal.html',
8080
transclude: true,
81-
controller: ['$scope', '$modal', '$transclude', function ($scope, $modal, $transclude) {
81+
controller: ['$scope', '$uibModal', '$transclude', function ($scope, $uibModal, $transclude) {
8282
if ($scope.isOpen === undefined) {
8383
$scope.isOpen = false;
8484
}
8585

8686
// The ui-bootstrap modal only supports either template or templateUrl as a way to specify the content.
87-
// When the content is retrieved, it is compiled and linked against the provided scope by the $modal service.
87+
// When the content is retrieved, it is compiled and linked against the provided scope by the $uibModal service.
8888
// Unfortunately, there is no way to provide transclusion there.
8989
//
9090
// The solution below embeds a placeholder directive (i.e., pfAboutModalTransclude) to append the transcluded DOM.
9191
// The transcluded DOM is from a different location than the modal, so it needs to be handed over to the
9292
// placeholder directive. Thus, we're passing the actual DOM, not the parsed HTML.
9393
$scope.openModal = function () {
94-
$modal.open({
95-
controller: ['$scope', '$modalInstance', 'content', function ($scope, $modalInstance, content) {
94+
$uibModal.open({
95+
controller: ['$scope', '$uibModalInstance', 'content', function ($scope, $uibModalInstance, content) {
9696
$scope.template = content;
9797
$scope.close = function () {
98-
$modalInstance.close();
98+
$uibModalInstance.close();
9999
};
100100
$scope.$watch(
101101
function () {
102102
return $scope.isOpen;
103103
},
104104
function (newValue) {
105105
if (newValue === false) {
106-
$modalInstance.close();
106+
$uibModalInstance.close();
107107
}
108108
}
109109
);

src/navigation/examples/vertical-navigation-basic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,4 +564,4 @@
564564
});
565565
</file>
566566
</example>
567-
*/
567+
*/

src/navigation/examples/vertical-navigation-router.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,4 @@
156156
});
157157
</file>
158158
</example>
159-
*/
159+
*/

src/navigation/vertical-navigation.html

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,19 @@
3838
'mobile-secondary-item-pf': item.isMobileItem && showMobileTertiary}"
3939
ng-mouseenter="handlePrimaryHover(item)" ng-mouseleave="handlePrimaryUnHover(item)">
4040
<a ng-click="handlePrimaryClick(item, $event)">
41-
<span class="{{item.iconClass}}" ng-if="item.iconClass" ng-class="{hidden: hiddenIcons}" tooltip-append-to-body="true" tooltip-enable="{{navCollapsed}}" tooltip-placement="bottom" tooltip="{{item.title}}" tooltip-class="nav-pf-vertical-tooltip"></span>
41+
<span class="{{item.iconClass}}" ng-if="item.iconClass" ng-class="{hidden: hiddenIcons}"
42+
uib-tooltip="{{item.title}}"
43+
tooltip-append-to-body="true"
44+
tooltip-enable="{{navCollapsed}}"
45+
tooltip-placement="bottom"
46+
tooltip-class="nav-pf-vertical-tooltip">
47+
</span>
4248
<span class="list-group-item-value">{{item.title}}</span>
4349
<div ng-if="showBadges && item.badges" class="badge-container-pf">
44-
<div class="badge {{badge.badgeClass}}" ng-repeat="badge in item.badges" tooltip-append-to-body="true" tooltip-placement="right" tooltip="{{badge.tooltip}}">
50+
<div class="badge {{badge.badgeClass}}" ng-repeat="badge in item.badges"
51+
uib-tooltip="{{badge.tooltip}}"
52+
tooltip-append-to-body="true"
53+
tooltip-placement="right">
4554
<span ng-if="badge.count && badge.iconClass" class="{{badge.iconClass}}"></span>
4655
<span ng-if="badge.count">{{badge.count}}</span>
4756
</div>
@@ -62,7 +71,10 @@
6271
<a ng-click="handleSecondaryClick(item, secondaryItem, $event)">
6372
<span class="list-group-item-value">{{secondaryItem.title}}</span>
6473
<div ng-if="showBadges && secondaryItem.badges" class="badge-container-pf">
65-
<div class="badge {{badge.badgeClass}}" ng-repeat="badge in secondaryItem.badges" tooltip-append-to-body="true" tooltip-placement="right" tooltip="{{badge.tooltip}}">
74+
<div class="badge {{badge.badgeClass}}" ng-repeat="badge in secondaryItem.badges"
75+
uib-tooltip="{{badge.tooltip}}"
76+
tooltip-append-to-body="true"
77+
tooltip-placement="right">
6678
<span ng-if="badge.count && badge.iconClass" class="{{badge.iconClass}}"></span>
6779
<span ng-if="badge.count">{{badge.count}}</span>
6880
</div>
@@ -78,7 +90,10 @@
7890
<a ng-click="handleTertiaryClick(item, secondaryItem, tertiaryItem, $event)">
7991
<span class="list-group-item-value">{{tertiaryItem.title}}</span>
8092
<div ng-if="showBadges && tertiaryItem.badges" class="badge-container-pf">
81-
<div class="badge {{badge.badgeClass}}" ng-repeat="badge in tertiaryItem.badges" tooltip-append-to-body="true" tooltip-placement="right" tooltip="{{badge.tooltip}}">
93+
<div class="badge {{badge.badgeClass}}" ng-repeat="badge in tertiaryItem.badges"
94+
uib-tooltip="{{badge.tooltip}}"
95+
tooltip-append-to-body="true"
96+
tooltip-placement="right">
8297
<span ng-if="badge.count && badge.iconClass" class="{{badge.iconClass}}"></span>
8398
<span ng-if="badge.count">{{badge.count}}</span>
8499
</div>

src/notification/toast-notification.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<div class="toast-pf alert alert-{{notificationType}}" ng-class="{'alert-dismissable': showCloseButton}"
22
ng-mouseenter="handleEnter()" ng-mouseleave="handleLeave()">
3-
<div class="dropdown pull-right dropdown-kebab-pf" ng-if="menuActions && menuActions.length > 0">
4-
<button class="btn btn-link dropdown-toggle" type="button" id="dropdownKebabRight" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
3+
<div uib-dropdown class="pull-right dropdown-kebab-pf" ng-if="menuActions && menuActions.length > 0">
4+
<button uib-dropdown-toggle class="btn btn-link" type="button" id="dropdownKebabRight">
55
<span class="fa fa-ellipsis-v"></span>
66
</button>
7-
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownKebabRight">
7+
<ul uib-dropdown-menu class="dropdown-menu-right" aria-labelledby="dropdownKebabRight">
88
<li ng-repeat="menuAction in menuActions"
99
role="{{menuAction.isSeparator === true ? 'separator' : 'menuitem'}}"
1010
ng-class="{'divider': menuAction.isSeparator === true, 'disabled': menuAction.isDisabled === true}">

src/sort/sort.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<div class="sort-pf">
22
<form>
33
<div class="form-group">
4-
<div class="dropdown btn-group">
5-
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
4+
<div uib-dropdown class="btn-group">
5+
<button uib-dropdown-toggle type="button" class="btn btn-default">
66
{{config.currentField.title}}
77
<span class="caret"></span>
88
</button>
9-
<ul class="dropdown-menu">
9+
<ul uib-dropdown-menu>
1010
<li ng-repeat="item in config.fields" ng-class="{'selected': item === config.currentField}">
1111
<a href="javascript:void(0);" class="sort-field" role="menuitem" tabindex="-1" ng-click="selectField(item)">
1212
{{item.title}}

0 commit comments

Comments
 (0)