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

Commit 2cb3bc2

Browse files
deegwesleycho
authored andcommitted
fix(datepicker): fix popup element garbage collection
- Ensures the correct element is selected due to ng-if replacing element with comment tag Closes #5274 Fixes #5058
1 parent c6504f8 commit 2cb3bc2

File tree

1 file changed

+12
-10
lines changed

1 file changed

+12
-10
lines changed

template/datepicker/popup.html

+12-10
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
1-
<ul class="uib-datepicker-popup dropdown-menu" dropdown-nested ng-if="isOpen" ng-style="{top: position.top+'px', left: position.left+'px'}" 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')" ng-disabled="isDisabled('today')">{{ getText('current') }}</button>
6-
<button type="button" class="btn btn-sm btn-danger uib-clear" ng-click="select(null)">{{ getText('clear') }}</button>
7-
</span>
8-
<button type="button" class="btn btn-sm btn-success pull-right uib-close" ng-click="close()">{{ getText('close') }}</button>
9-
</li>
10-
</ul>
1+
<div>
2+
<ul class="uib-datepicker-popup dropdown-menu" dropdown-nested ng-if="isOpen" ng-style="{top: position.top+'px', left: position.left+'px'}" 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')" ng-disabled="isDisabled('today')">{{ getText('current') }}</button>
7+
<button type="button" class="btn btn-sm btn-danger uib-clear" ng-click="select(null)">{{ getText('clear') }}</button>
8+
</span>
9+
<button type="button" class="btn btn-sm btn-success pull-right uib-close" ng-click="close()">{{ getText('close') }}</button>
10+
</li>
11+
</ul>
12+
</div>

0 commit comments

Comments
 (0)