Skip to content
This repository has been archived by the owner on Apr 12, 2024. It is now read-only.

Commit

Permalink
fix(ngModel): support milliseconds in time and datetime
Browse files Browse the repository at this point in the history 
Closes #8874
  • Loading branch information
@shahata @btford
shahata authored and btford committed Sep 22, 2014
1 parent a591e8b commit 4b83f6c
Show file tree
Hide file tree
Showing 2 changed files with 51 additions and 23 deletions.
16 changes: 8 additions & 8 deletions src/ng/directive/input.js
View file
Expand Up @@ -14,10 +14,10 @@ var URL_REGEXP = /^(ftp|http|https):\/\/(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\
var EMAIL_REGEXP = /^[a-z0-9!#$%&'*+\/=?^_`{|}~.-]+@[a-z0-9]([a-z0-9-]*[a-z0-9])?(\.[a-z0-9]([a-z0-9-]*[a-z0-9])?)*$/i;
var NUMBER_REGEXP = /^\s*(\-|\+)?(\d+|(\d*(\.\d*)))\s*$/;
var DATE_REGEXP = /^(\d{4})-(\d{2})-(\d{2})$/;
var DATETIMELOCAL_REGEXP = /^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d))?$/;
var DATETIMELOCAL_REGEXP = /^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
var WEEK_REGEXP = /^(\d{4})-W(\d\d)$/;
var MONTH_REGEXP = /^(\d{4})-(\d\d)$/;
var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d))?$/;
var TIME_REGEXP = /^(\d\d):(\d\d)(?::(\d\d)(\.\d{1,3})?)?$/;
var DEFAULT_REGEXP = /(\s+|^)default(\s+|$)/;

var $ngModelMinErr = new minErr('ngModel');
Expand Down Expand Up @@ -281,8 +281,8 @@ var inputType = {
</example>
*/
'datetime-local': createDateInputType('datetimelocal', DATETIMELOCAL_REGEXP,
createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss']),
'yyyy-MM-ddTHH:mm:ss'),
createDateParser(DATETIMELOCAL_REGEXP, ['yyyy', 'MM', 'dd', 'HH', 'mm', 'ss', 'sss']),
'yyyy-MM-ddTHH:mm:ss.sss'),

/**
* @ngdoc input
Expand Down Expand Up @@ -370,8 +370,8 @@ var inputType = {
</example>
*/
'time': createDateInputType('time', TIME_REGEXP,
createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss']),
'HH:mm:ss'),
createDateParser(TIME_REGEXP, ['HH', 'mm', 'ss', 'sss']),
'HH:mm:ss.sss'),

/**
* @ngdoc input
Expand Down Expand Up @@ -1067,7 +1067,7 @@ function createDateParser(regexp, mapping) {
HH: date.getHours(),
mm: date.getMinutes(),
ss: date.getSeconds(),
sss: date.getMilliseconds()
sss: date.getMilliseconds() / 1000
};
} else {
map = { yyyy: 1970, MM: 1, dd: 1, HH: 0, mm: 0, ss: 0, sss: 0 };
Expand All @@ -1078,7 +1078,7 @@ function createDateParser(regexp, mapping) {
map[mapping[index]] = +part;
}
});
return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss || 0);
return new Date(map.yyyy, map.MM - 1, map.dd, map.HH, map.mm, map.ss || 0, map.sss * 1000 || 0);
}
}

Expand Down
58 changes: 43 additions & 15 deletions test/ng/directive/inputSpec.js
View file
Expand Up @@ -2590,13 +2590,13 @@ describe('input', function() {
});

it('should set the view if the model if a valid Date object.', function(){
compileInput('<input type="datetime-local" ng-model="tenSecondsToNextYear"/>');
compileInput('<input type="datetime-local" ng-model="halfSecondToNextYear"/>');

scope.$apply(function (){
scope.tenSecondsToNextYear = new Date(2013, 11, 31, 23, 59, 0);
scope.halfSecondToNextYear = new Date(2013, 11, 31, 23, 59, 59, 500);
});

expect(inputElm.val()).toBe('2013-12-31T23:59:00');
expect(inputElm.val()).toBe('2013-12-31T23:59:59.500');
});

it('should set the model undefined if the view is invalid', function (){
Expand All @@ -2606,7 +2606,7 @@ describe('input', function() {
scope.breakMe = new Date(2009, 0, 6, 16, 25, 0);
});

expect(inputElm.val()).toBe('2009-01-06T16:25:00');
expect(inputElm.val()).toBe('2009-01-06T16:25:00.000');

try {
//set to text for browsers with datetime-local validation.
Expand Down Expand Up @@ -2663,7 +2663,21 @@ describe('input', function() {
scope.$apply(function() {
scope.value = new Date(Date.UTC(2001, 0, 1, 1, 2, 0));
});
expect(inputElm.val()).toBe('2001-01-01T01:02:00');
expect(inputElm.val()).toBe('2001-01-01T01:02:00.000');
});

it('should allow to specify the milliseconds', function() {
compileInput('<input type="datetime-local" ng-model="value"" />');

changeInputValueTo('2000-01-01T01:02:03.500');
expect(+scope.value).toBe(+new Date(2000, 0, 1, 1, 2, 3, 500));
});

it('should allow to specify single digit milliseconds', function() {
compileInput('<input type="datetime-local" ng-model="value"" />');

changeInputValueTo('2000-01-01T01:02:03.4');
expect(+scope.value).toBe(+new Date(2000, 0, 1, 1, 2, 3, 400));
});

it('should allow to specify the seconds', function() {
Expand All @@ -2675,7 +2689,7 @@ describe('input', function() {
scope.$apply(function() {
scope.value = new Date(2001, 0, 1, 1, 2, 3);
});
expect(inputElm.val()).toBe('2001-01-01T01:02:03');
expect(inputElm.val()).toBe('2001-01-01T01:02:03.000');
});

it('should allow to skip the seconds', function() {
Expand Down Expand Up @@ -2854,10 +2868,10 @@ describe('input', function() {
compileInput('<input type="time" ng-model="threeFortyOnePm"/>');

scope.$apply(function (){
scope.threeFortyOnePm = new Date(1970, 0, 1, 15, 41, 0);
scope.threeFortyOnePm = new Date(1970, 0, 1, 15, 41, 0, 500);
});

expect(inputElm.val()).toBe('15:41:00');
expect(inputElm.val()).toBe('15:41:00.500');
});

it('should set the model undefined if the view is invalid', function (){
Expand All @@ -2867,7 +2881,7 @@ describe('input', function() {
scope.breakMe = new Date(1970, 0, 1, 16, 25, 0);
});

expect(inputElm.val()).toBe('16:25:00');
expect(inputElm.val()).toBe('16:25:00.000');

try {
//set to text for browsers with time validation.
Expand Down Expand Up @@ -2924,7 +2938,21 @@ describe('input', function() {
scope.$apply(function() {
scope.value = new Date(Date.UTC(1971, 0, 1, 23, 2, 0));
});
expect(inputElm.val()).toBe('23:02:00');
expect(inputElm.val()).toBe('23:02:00.000');
});

it('should allow to specify the milliseconds', function() {
compileInput('<input type="time" ng-model="value"" />');

changeInputValueTo('01:02:03.500');
expect(+scope.value).toBe(+new Date(1970, 0, 1, 1, 2, 3, 500));
});

it('should allow to specify single digit milliseconds', function() {
compileInput('<input type="time" ng-model="value"" />');

changeInputValueTo('01:02:03.4');
expect(+scope.value).toBe(+new Date(1970, 0, 1, 1, 2, 3, 400));
});

it('should allow to specify the seconds', function() {
Expand All @@ -2936,7 +2964,7 @@ describe('input', function() {
scope.$apply(function() {
scope.value = new Date(1970, 0, 1, 1, 2, 3);
});
expect(inputElm.val()).toBe('01:02:03');
expect(inputElm.val()).toBe('01:02:03.000');
});

it('should allow to skip the seconds', function() {
Expand Down Expand Up @@ -3192,13 +3220,13 @@ describe('input', function() {
scope.val = new Date(2013, 1, 2, 3, 4, 5, 6);
});

expect(timeElm.val()).toBe('03:04:05');
expect(timeElm.val()).toBe('03:04:05.006');
expect(monthElm.val()).toBe('2013-02');
expect(weekElm.val()).toBe('2013-W05');

changeGivenInputTo(monthElm, '2012-02');
expect(monthElm.val()).toBe('2012-02');
expect(timeElm.val()).toBe('03:04:05');
expect(timeElm.val()).toBe('03:04:05.006');
expect(weekElm.val()).toBe('2012-W05');

changeGivenInputTo(timeElm, '04:05:06');
Expand All @@ -3208,10 +3236,10 @@ describe('input', function() {

changeGivenInputTo(weekElm, '2014-W01');
expect(monthElm.val()).toBe('2014-01');
expect(timeElm.val()).toBe('04:05:06');
expect(timeElm.val()).toBe('04:05:06.000');
expect(weekElm.val()).toBe('2014-W01');

expect(+scope.val).toBe(+new Date(2014, 0, 2, 4, 5, 6, 6));
expect(+scope.val).toBe(+new Date(2014, 0, 2, 4, 5, 6, 0));

function changeGivenInputTo(inputElm, value) {
inputElm.val(value);
Expand Down

0 comments on commit 4b83f6c

Please sign in to comment.