fix(datepicker): datepicker-popup nest in dropdown

sullivanpt · sullivanpt · commit ce3149d3266f · 2015-10-22T10:58:28.000-07:00
Extends the fix from commit c5fe8b to the deprecated non uib dropdown-menu. Closes angular-ui#4197
diff --git a/src/dropdown/dropdown.js b/src/dropdown/dropdown.js
@@ -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;
       }
 

Original file line number	Diff line number	Diff line change
`@@ -551,7 +551,7 @@ angular.module('ui.bootstrap.dropdown')`
`551`	`551`	`restrict: 'AC',`
`552`	`552`	`require: '?^dropdown',`
`553`	`553`	`link: function(scope, element, attrs, dropdownCtrl) {`
`554`		`- if (!dropdownCtrl) {`
	`554`	`+ if (!dropdownCtrl \|\| angular.isDefined(attrs.dropdownNested)) {`
`555`	`555`	`return;`
`556`	`556`	`}`
`557`	`557`