Skip to content
This repository was archived by the owner on May 29, 2019. It is now read-only.

Commit a47bced

Browse files
committed
feat(datepickerPopup): remove replace usage
- Remove `replace: true` usage BREAKING CHANGE: Due to the nature of `replace: true`, this has a slight structural HTML change in the popup as a result - see documentation examples for the change in action. Closes #5993
1 parent 387c6e7 commit a47bced

File tree

3 files changed

+12
-14
lines changed

3 files changed

+12
-14
lines changed

src/datepickerPopup/popup.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ function($scope, $element, $attrs, $compile, $log, $parse, $window, $document, $
434434

435435
.directive('uibDatepickerPopupWrap', function() {
436436
return {
437-
replace: true,
437+
restrict: 'A',
438438
transclude: true,
439439
templateUrl: function(element, attrs) {
440440
return attrs.templateUrl || 'uib/template/datepickerPopup/popup.html';

src/datepickerPopup/test/popup.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1344,7 +1344,7 @@ describe('datepicker popup', function() {
13441344
$compile(elm)($rootScope);
13451345
$rootScope.$digest();
13461346

1347-
expect(elm.children().eq(1).html()).toBe('baz');
1347+
expect(elm.children().eq(1).html()).toBe('<div>baz</div>');
13481348
});
13491349
});
13501350

template/datepickerPopup/popup.html

+10-12
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
<div>
2-
<ul class="uib-datepicker-popup dropdown-menu uib-position-measure" dropdown-nested ng-if="isOpen" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
3-
<li ng-transclude></li>
4-
<li ng-if="showButtonBar" class="uib-button-bar">
5-
<span class="btn-group pull-left">
6-
<button type="button" class="btn btn-sm btn-info uib-datepicker-current" ng-click="select('today', $event)" ng-disabled="isDisabled('today')">{{ getText('current') }}</button>
7-
<button type="button" class="btn btn-sm btn-danger uib-clear" ng-click="select(null, $event)">{{ getText('clear') }}</button>
8-
</span>
9-
<button type="button" class="btn btn-sm btn-success pull-right uib-close" ng-click="close($event)">{{ getText('close') }}</button>
10-
</li>
11-
</ul>
12-
</div>
1+
<ul class="uib-datepicker-popup dropdown-menu uib-position-measure" dropdown-nested ng-if="isOpen" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
2+
<li ng-transclude></li>
3+
<li ng-if="showButtonBar" class="uib-button-bar">
4+
<span class="btn-group pull-left">
5+
<button type="button" class="btn btn-sm btn-info uib-datepicker-current" ng-click="select('today', $event)" ng-disabled="isDisabled('today')">{{ getText('current') }}</button>
6+
<button type="button" class="btn btn-sm btn-danger uib-clear" ng-click="select(null, $event)">{{ getText('clear') }}</button>
7+
</span>
8+
<button type="button" class="btn btn-sm btn-success pull-right uib-close" ng-click="close($event)">{{ getText('close') }}</button>
9+
</li>
10+
</ul>

0 commit comments

Comments
 (0)