aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorIgor Minar2010-11-08 10:51:28 -0800
committerIgor Minar2010-11-08 22:49:30 -0800
commitfc9ce9ec075aa21cdf6a79987e4aa152991f6a44 (patch)
treed68ea23ebb8682dcccafe3890d8ff70d07a23a09 /src
parentda17c614441c28907047442997bd4d99cdc6eaa1 (diff)
downloadangular.js-fc9ce9ec075aa21cdf6a79987e4aa152991f6a44.tar.bz2
make angular.String.toDate consider all time fractions as optional
Diffstat (limited to 'src')
-rw-r--r--src/apis.js7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/apis.js b/src/apis.js
index f8deb6ae..a9a9379d 100644
--- a/src/apis.js
+++ b/src/apis.js
@@ -177,6 +177,8 @@ var angularArray = {
}
};
+var R_ISO8061_STR = /^(\d{4})-(\d\d)-(\d\d)(?:T(\d\d)(?:\:(\d\d)(?:\:(\d\d)(?:\.(\d{3}))?)?)?Z)?$/
+
var angularString = {
'quote':function(string) {
return '"' + string.replace(/\\/g, '\\\\').
@@ -210,11 +212,10 @@ var angularString = {
*/
'toDate':function(string){
var match;
- if (typeof string == 'string' &&
- (match = string.match(/^(\d{4})-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)\.(\d{3})Z$/))){
+ if (isString(string) && (match = string.match(R_ISO8061_STR))){
var date = new Date(0);
date.setUTCFullYear(match[1], match[2] - 1, match[3]);
- date.setUTCHours(match[4], match[5], match[6], match[7]);
+ date.setUTCHours(match[4]||0, match[5]||0, match[6]||0, match[7]||0);
return date;
}
return string;