fix number #257 , show calendar with respect of date format, thanks to …

…@petr-vysotskiy
720kb · May 5, 2017 · 1776b08 · 1776b08
1 parent d02e171
commit 1776b08
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "angularjs-datepicker",
-  "version": "2.1.17",
+  "version": "2.1.18",
   "description": "A datepicker directive for angularjs.",
   "authors": [
     "Filippo Oretti <filippo.oretti@gmail.com",

diff --git a/dist/angular-datepicker.js b/dist/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'));

diff --git a/dist/angular-datepicker.min.js b/dist/angular-datepicker.min.js
diff --git a/dist/angular-datepicker.sourcemap.map b/dist/angular-datepicker.sourcemap.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "angularjs-datepicker",
-  "version": "2.1.17",
+  "version": "2.1.18",
   "description": "A datepicker directive for angularjs.",
   "homepage": "http://720kb.github.io/angular-datepicker",
   "keywords": [