Skip to content

Commit

Permalink
fix(datepicker): datepicker-popup nest in dropdown
Browse files Browse the repository at this point in the history
Extends the fix from commit c5fe8b to the deprecated
non uib dropdown-menu.

Closes angular-ui#4197
  • Loading branch information
sullivanpt committed Oct 22, 2015
1 parent a6cb8d3 commit ce3149d
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/dropdown/dropdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ angular.module('ui.bootstrap.dropdown')
restrict: 'AC',
require: '?^dropdown',
link: function(scope, element, attrs, dropdownCtrl) {
if (!dropdownCtrl) {
if (!dropdownCtrl || angular.isDefined(attrs.dropdownNested)) {
return;
}

Expand Down

0 comments on commit ce3149d

Please sign in to comment.