From 17411d02ff81f3242821bfca3a71c6da1e1dd6ac Mon Sep 17 00:00:00 2001 From: Kacper Date: Thu, 15 Feb 2018 19:28:11 +0100 Subject: [PATCH] change order of events --- src/js/angular-datepicker.js | 38 ++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/src/js/angular-datepicker.js b/src/js/angular-datepicker.js index 971dbc9..74718bf 100644 --- a/src/js/angular-datepicker.js +++ b/src/js/angular-datepicker.js @@ -454,25 +454,6 @@ $scope.selectedYear = Number($filter('date')(date, 'yyyy')); return $scope.$eval($scope.datepickerShow); } - , unregisterDataSetWatcher = $scope.$watch('dateSet', function dateSetWatcher(newValue) { - - if (newValue && !isNaN(Date.parse(newValue))) { - - date = new Date(newValue); - - $scope.month = $filter('date')(date, 'MMMM');//december-November like - $scope.monthNumber = Number($filter('date')(date, 'MM')); // 01-12 like - $scope.day = Number($filter('date')(date, 'dd')); //01-31 like - $scope.year = Number($filter('date')(date, 'yyyy'));//2014 like - - setDaysInMonth($scope.monthNumber, $scope.year); - - if ($scope.dateSetHidden !== 'true') { - - setInputValue(); - } - } - }) , unregisterDateMinLimitWatcher = $scope.$watch('dateMinLimit', function dateMinLimitWatcher(newValue) { if (newValue) { resetToMinDate(); @@ -509,6 +490,25 @@ thisInput.triggerHandler('change');//just to be sure; } } + }) + , unregisterDataSetWatcher = $scope.$watch('dateSet', function dateSetWatcher(newValue) { + + if (newValue && !isNaN(Date.parse(newValue))) { + + date = new Date(newValue); + + $scope.month = $filter('date')(date, 'MMMM');//december-November like + $scope.monthNumber = Number($filter('date')(date, 'MM')); // 01-12 like + $scope.day = Number($filter('date')(date, 'dd')); //01-31 like + $scope.year = Number($filter('date')(date, 'yyyy'));//2014 like + + setDaysInMonth($scope.monthNumber, $scope.year); + + if ($scope.dateSetHidden !== 'true') { + + setInputValue(); + } + } }); $scope.nextMonth = function nextMonth() {