Merge pull request #282 from niccord/master

Fix today button
rajeshwarpatlolla · Sep 6, 2017 · 6dcbf0d · 6dcbf0d
2 parents 81504f2 + 109117d
commit 6dcbf0d
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/ionic-datepicker.provider.js b/src/ionic-datepicker.provider.js
@@ -89,13 +89,7 @@ angular.module('ionic-datepicker.provider', [])
 
       //Set today as date for the modal
       $scope.setIonicDatePickerTodayDate = function () {
-        var today = new Date();
-        refreshDateList(new Date());
-        $scope.selctedDateEpoch = resetHMSM(today).getTime();
-        if ($scope.mainObj.closeOnSelect) {
-          $scope.mainObj.callback($scope.selctedDateEpoch);
-          closeModal();
-        }
+        $scope.dateSelected($scope.today);
       };
 
       //Set date for the modal
@@ -265,7 +259,17 @@ angular.module('ionic-datepicker.provider', [])
             text: $scope.mainObj.todayLabel,
             type: 'button_today',
             onTap: function (e) {
-              var today = new Date();
+              var today = new Date($scope.today);
+              var today_obj = {
+                date: today.getDate(),
+                month: today.getMonth(),
+                year: today.getFullYear(),
+                day: today.getDay(),
+                epoch: today.getTime(),
+                disabled: false
+              };
+              $scope.dateSelected(today_obj);
+
               refreshDateList(new Date());
               $scope.selctedDateEpoch = resetHMSM(today).getTime();
               $scope.mainObj.callback($scope.selctedDateEpoch);