From 1e7b089fa8c02450561b357842cccf617ce29513 Mon Sep 17 00:00:00 2001
From: Rafael Garcia <rafbgarcia@gmail.com>
Date: Sat, 15 Feb 2014 18:00:09 -0300
Subject: [PATCH 1/4] Fixed wrong param name dateFormat in
 datepickerPopupConfig

---
 src/datepicker/datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
index e04543aa19..5aa81f61d4 100644
--- a/src/datepicker/datepicker.js
+++ b/src/datepicker/datepicker.js
@@ -296,7 +296,7 @@ angular.module('ui.bootstrap.datepicker', ['ui.bootstrap.position'])
 })
 
 .constant('datepickerPopupConfig', {
-  dateFormat: 'yyyy-MM-dd',
+  datepickerPopup: 'yyyy-MM-dd',
   currentText: 'Today',
   clearText: 'Clear',
   closeText: 'Done',

From b555fa68fc8fb5741678c967a9fd73939002115f Mon Sep 17 00:00:00 2001
From: Rafael Garcia <rafbgarcia@gmail.com>
Date: Sat, 15 Feb 2014 18:24:46 -0300
Subject: [PATCH 2/4] fix(datepicker): wrong param dateFormat in
 datepickerPopupConfig

---
 src/datepicker/datepicker.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/datepicker/datepicker.js b/src/datepicker/datepicker.js
index 5aa81f61d4..445ce19c5d 100644
--- a/src/datepicker/datepicker.js
+++ b/src/datepicker/datepicker.js
@@ -328,7 +328,7 @@ function ($compile, $parse, $document, $position, dateFilter, datepickerPopupCon
       };
 
       attrs.$observe('datepickerPopup', function(value) {
-          dateFormat = value || datepickerPopupConfig.dateFormat;
+          dateFormat = value || datepickerPopupConfig.datepickerPopup;
           ngModel.$render();
       });
 

From 440eb91c51fa309eb6ca39ec435a9c5902c444f7 Mon Sep 17 00:00:00 2001
From: Rafael Garcia <rafbgarcia@gmail.com>
Date: Sat, 22 Feb 2014 00:12:53 -0300
Subject: [PATCH 3/4] test(datepicker): Added a test for the datepickerPopup
 param

---
 src/datepicker/test/datepicker.spec.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
index 1bafc4d336..e2d5d6db23 100644
--- a/src/datepicker/test/datepicker.spec.js
+++ b/src/datepicker/test/datepicker.spec.js
@@ -810,10 +810,18 @@ describe('datepicker directive', function () {
         };
       }));
 
-      it('to display the correct value in input', function() {
+      it('displays the correct value as yyyy-MM-dd by default', function() {
         expect(inputEl.val()).toBe('2010-09-30');
       });
 
+      it('displays the value as specified in the datepicker-popup attribute', function() {
+        var wrapElement = $compile('<div><input ng-model="date" datepicker-popup="MM-dd-yyyy"><div>')($rootScope);
+        $rootScope.$digest();
+        assignElements(wrapElement);
+
+        expect(inputEl.val()).toEqual('09-30-2010');
+      });
+
       it('does not to display datepicker initially', function() {
         expect(dropdownEl).toBeHidden();
       });

From 9d213acafb9b2fd22f1cb44a1f593522156adb34 Mon Sep 17 00:00:00 2001
From: Rafael Garcia <rafbgarcia@gmail.com>
Date: Sat, 22 Feb 2014 15:29:50 -0300
Subject: [PATCH 4/4] fix(datepicker): added test to datepickerPopup

---
 src/datepicker/test/datepicker.spec.js | 34 ++++++++++++++++++++------
 1 file changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/datepicker/test/datepicker.spec.js b/src/datepicker/test/datepicker.spec.js
index e2d5d6db23..fddcf7f97f 100644
--- a/src/datepicker/test/datepicker.spec.js
+++ b/src/datepicker/test/datepicker.spec.js
@@ -786,6 +786,32 @@ describe('datepicker directive', function () {
 
   });
 
+  describe('setting datepickerPopupConfig', function() {
+    var originalConfig = {};
+    beforeEach(inject(function(datepickerPopupConfig) {
+      angular.extend(originalConfig, datepickerPopupConfig);
+      datepickerPopupConfig.datepickerPopup = 'MM-dd-yyyy';
+      datepickerPopupConfig.currentText = 'Today';
+      datepickerPopupConfig.clearText = 'Clear';
+      datepickerPopupConfig.closeText = 'Done';
+      datepickerPopupConfig.closeOnDateSelection = true;
+      datepickerPopupConfig.appendToBody = false;
+      datepickerPopupConfig.showButtonBar = true;
+
+      element = $compile('<input ng-model="date" datepicker-popup>')($rootScope);
+      $rootScope.$digest();
+    }));
+    afterEach(inject(function(datepickerPopupConfig) {
+      // return it to the original state
+      angular.extend(datepickerPopupConfig, originalConfig);
+    }));
+
+    it('changes date format', function() {
+      expect(element.val()).toEqual('09-30-2010');
+    });
+
+  });
+
   describe('as popup', function () {
     var inputEl, dropdownEl, changeInputValueTo, $document;
 
@@ -814,14 +840,6 @@ describe('datepicker directive', function () {
         expect(inputEl.val()).toBe('2010-09-30');
       });
 
-      it('displays the value as specified in the datepicker-popup attribute', function() {
-        var wrapElement = $compile('<div><input ng-model="date" datepicker-popup="MM-dd-yyyy"><div>')($rootScope);
-        $rootScope.$digest();
-        assignElements(wrapElement);
-
-        expect(inputEl.val()).toEqual('09-30-2010');
-      });
-
       it('does not to display datepicker initially', function() {
         expect(dropdownEl).toBeHidden();
       });