Skip to content

Commit

Permalink
Reverting change for Issue #24
Browse files Browse the repository at this point in the history
  • Loading branch information
Gillardo committed Jul 8, 2015
1 parent c28c7fb commit 8dc6314
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-ui-datetime-picker",
"version": "1.1.2",
"version": "1.1.3",
"homepage": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
"authors": [
"Gillardo <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion datetime-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
ngModel.$setValidity('date', true);
return viewValue;
} else if (angular.isString(viewValue)) {
var date = dateParser.parse(viewValue, dateFormat);
var date = dateParser.parse(viewValue, dateFormat) || new Date(viewValue);

if (isNaN(date)) {
ngModel.$setValidity('date', false);
Expand Down
6 changes: 3 additions & 3 deletions dist/datetime-picker.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// https://github.com/Gillardo/bootstrap-ui-datetime-picker
// Version: 1.1.2
// Released: 2015-07-07
// Version: 1.1.3
// Released: 2015-07-08
angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
.constant('uiDatetimePickerConfig', {
dateFormat: 'yyyy-MM-dd HH:mm',
Expand Down Expand Up @@ -134,7 +134,7 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
ngModel.$setValidity('date', true);
return viewValue;
} else if (angular.isString(viewValue)) {
var date = dateParser.parse(viewValue, dateFormat);
var date = dateParser.parse(viewValue, dateFormat) || new Date(viewValue);

if (isNaN(date)) {
ngModel.$setValidity('date', false);
Expand Down
6 changes: 3 additions & 3 deletions dist/datetime-picker.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "bootstrap-ui-datetime-picker",
"url": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
"version": "1.1.2",
"version": "1.1.3",
"devDependencies": {
"grunt": "^0.4.5",
"grunt-angular-templates": "^0.5.7",
Expand Down

0 comments on commit 8dc6314

Please sign in to comment.