Merge pull request #257 from petr-vysotskiy/master

Show calendar with respect to date format
720kb · May 5, 2017 · d02e171 · d02e171
2 parents 1fd010d + 4515f85
commit d02e171
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/js/angular-datepicker.js b/src/js/angular-datepicker.js
@@ -158,7 +158,6 @@
           //, dateMaxLimit
           , dateDisabledDates = $scope.$eval($scope.dateDisabledDates)
           , date = new Date()
-          , dateString
           , isMouseOn = false
           , isMouseOnInput = false
           , preventMobile = typeof attr.datepickerMobile !== 'undefined' && attr.datepickerMobile !== 'false'
@@ -405,8 +404,11 @@
             if (theCalendar.classList) {
 
               theCalendar.classList.add('_720kb-datepicker-open');
-              dateString = angular.element(angular.element(theCalendar).parent()[0].querySelector('input')).val().replace(/\//g, '-');
-              date = new Date(dateString);
+              if (dateFormat) {
+                date = localDateTimestamp(thisInput[0].value.toString(), dateFormat);
+              } else {
+                date = new Date(thisInput[0].value.toString());
+              }
               $scope.selectedMonth = Number($filter('date')(date, 'MM'));
               $scope.selectedDay = Number($filter('date')(date, 'dd'));
               $scope.selectedYear = Number($filter('date')(date, 'yyyy'));