Skip to content

Commit d4ada46

Browse files
author
masayosh4
authored
Merge pull request #1 from verybestjp/feature-dateformat
input formのdate format対応
2 parents 44632f7 + 8837372 commit d4ada46

File tree

4 files changed

+11
-14
lines changed

4 files changed

+11
-14
lines changed

dist/angular-datepicker.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,12 @@
358358
} else {
359359
modelDate = new Date($scope.year + '/' + $scope.monthNumber + '/' + $scope.day);
360360
}
361+
362+
if (attr.dateFormat) {
363+
modelDate = $filter('date')(modelDate, dateFormat);
364+
}
361365
ngModelCtrl.$setViewValue(modelDate);
362366

363-
thisInput.triggerHandler('input');
364-
thisInput.triggerHandler('change');//just to be sure;
365367
} else {
366368

367369
return false;

dist/angular-datepicker.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/angular-datepicker.sourcemap.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/js/angular-datepicker.js

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -358,10 +358,12 @@
358358
} else {
359359
modelDate = new Date($scope.year + '/' + $scope.monthNumber + '/' + $scope.day);
360360
}
361+
362+
if (attr.dateFormat) {
363+
modelDate = $filter('date')(modelDate, dateFormat);
364+
}
361365
ngModelCtrl.$setViewValue(modelDate);
362366

363-
thisInput.triggerHandler('input');
364-
thisInput.triggerHandler('change');//just to be sure;
365367
} else {
366368

367369
return false;
@@ -506,8 +508,6 @@
506508

507509
if (!$scope.isSelectableDate($scope.monthNumber, $scope.year, $scope.day)) {
508510
ngModelCtrl.$setViewValue(null);
509-
thisInput.triggerHandler('input');
510-
thisInput.triggerHandler('change');//just to be sure;
511511
}
512512
}
513513
})
@@ -517,8 +517,6 @@
517517

518518
if (!$scope.isSelectableDate($scope.monthNumber, $scope.year, $scope.day)) {
519519
ngModelCtrl.$setViewValue(null);
520-
thisInput.triggerHandler('input');
521-
thisInput.triggerHandler('change');//just to be sure;
522520
}
523521
}
524522
});
@@ -896,9 +894,6 @@
896894

897895
$scope.clear = function clear() {
898896
ngModelCtrl.$setViewValue(null);
899-
thisInput.triggerHandler('input');
900-
thisInput.triggerHandler('change');//just to be sure;
901-
902897
$scope.hideCalendar();
903898
};
904899

0 commit comments

Comments
 (0)