Skip to content

Commit

Permalink
2.6.3
Browse files Browse the repository at this point in the history
Disabled masking as code not working
  • Loading branch information
Gillardo committed Apr 25, 2018
1 parent 067b269 commit 9d62565
Show file tree
Hide file tree
Showing 5 changed files with 13 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": "2.6.2",
"version": "2.6.3",
"homepage": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
"authors": [
"Gillardo <[email protected]>"
Expand Down
4 changes: 3 additions & 1 deletion datetime-picker.js
Original file line number Diff line number Diff line change
Expand Up @@ -627,9 +627,11 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
}

function parseDateString(viewValue) {
viewValue = applyMask(viewValue) || viewValue;
// disabled as not functioning correctly
// viewValue = applyMask(viewValue) || viewValue;

var date = uibDateParser.parse(viewValue, dateFormat, $scope.date);

if (isNaN(date)) {
for (var i = 0; i < altInputFormats.length; i++) {
date = uibDateParser.parse(viewValue, altInputFormats[i], $scope.date);
Expand Down
8 changes: 5 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: 2.6.2
// Released: 2018-04-17
// Version: 2.6.3
// Released: 2018-04-25
angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bootstrap.position'])
.constant('uiDatetimePickerConfig', {
dateFormat: 'yyyy-MM-dd HH:mm',
Expand Down Expand Up @@ -630,9 +630,11 @@ angular.module('ui.bootstrap.datetimepicker', ['ui.bootstrap.dateparser', 'ui.bo
}

function parseDateString(viewValue) {
viewValue = applyMask(viewValue) || viewValue;
// disabled as not functioning correctly
// viewValue = applyMask(viewValue) || viewValue;

var date = uibDateParser.parse(viewValue, dateFormat, $scope.date);

if (isNaN(date)) {
for (var i = 0; i < altInputFormats.length; i++) {
date = uibDateParser.parse(viewValue, altInputFormats[i], $scope.date);
Expand Down
6 changes: 3 additions & 3 deletions dist/datetime-picker.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-ui-datetime-picker",
"version": "2.6.2",
"version": "2.6.3",
"url": "https://github.com/Gillardo/bootstrap-ui-datetime-picker",
"authors": [
"Gillardo <[email protected]>"
Expand Down

0 comments on commit 9d62565

Please sign in to comment.