fix(datepicker): fix support for literal format on popup

- Add check for `uibDatepickerPopup` Closes #4635 Fixes #4616
angular-ui · Oct 19, 2015 · 7c3c631 · 7c3c631
1 parent 6d1cd0f
commit 7c3c631
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
@@ -550,7 +550,7 @@ function(scope, element, attrs, $compile, $parse, $document, $rootScope, $positi
       dateFormat = datepickerPopupConfig.html5Types[attrs.type];
       isHtml5DateInput = true;
     } else {
-      dateFormat = attrs.datepickerPopup || datepickerPopupConfig.datepickerPopup;
+      dateFormat = attrs.datepickerPopup || attrs.uibDatepickerPopup || datepickerPopupConfig.datepickerPopup;
       attrs.$observe('uibDatepickerPopup', function(value, oldValue) {
           var newDateFormat = value || datepickerPopupConfig.datepickerPopup;
           // Invalidate the $modelValue to ensure that formatters re-run