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

Commit 6b4267b

Browse files
sullivanptwesleycho
authored andcommitted
fix(datepicker): datepicker-popup nest in dropdown
- Add `dropdown-nested` class hack to avoid problems with dropdown controller Closes #4489 Fixes #4197
1 parent 0b3d5bd commit 6b4267b

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/dropdown/dropdown.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ angular.module('ui.bootstrap.dropdown', ['ui.bootstrap.position'])
250250
restrict: 'AC',
251251
require: '?^uibDropdown',
252252
link: function(scope, element, attrs, dropdownCtrl) {
253-
if (!dropdownCtrl) {
253+
if (!dropdownCtrl || angular.isDefined(attrs.dropdownNested)) {
254254
return;
255255
}
256256

template/datepicker/popup.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ul class="dropdown-menu" ng-if="isOpen" style="display: block" ng-style="{top: position.top+'px', left: position.left+'px'}" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
1+
<ul class="dropdown-menu" dropdown-nested ng-if="isOpen" style="display: block" ng-style="{top: position.top+'px', left: position.left+'px'}" ng-keydown="keydown($event)" ng-click="$event.stopPropagation()">
22
<li ng-transclude></li>
33
<li ng-if="showButtonBar" style="padding:10px 9px 2px">
44
<span class="btn-group pull-left">

0 commit comments

Comments
 (0)