aboutsummaryrefslogtreecommitdiffstats
path: root/src/filters.js
diff options
context:
space:
mode:
authorIgor Minar2010-10-23 18:44:32 -0700
committerIgor Minar2010-10-25 10:44:03 -0700
commit841013a4c4d25acf6fc9ff40e449c3d0a4b82ec3 (patch)
treef01cdcc51efdab4d30566dc838de203317ef5531 /src/filters.js
parent4e9a2aa10ec6e84377aebd37fd3ae44af3d9423a (diff)
downloadangular.js-841013a4c4d25acf6fc9ff40e449c3d0a4b82ec3.tar.bz2
Add millisecond support for date filter
Date filter should translate input which is a number (or number string) into a date.
Diffstat (limited to 'src/filters.js')
-rw-r--r--src/filters.js12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/filters.js b/src/filters.js
index 5b734882..103cd2de 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -73,9 +73,19 @@ var DATE_FORMATS = {
}
};
var DATE_FORMATS_SPLIT = /([^yMdHhmsaZ]*)(y+|M+|d+|H+|h+|m+|s+|a|Z)(.*)/;
+var NUMBER_STRING = /^\d+$/;
angularFilter.date = function(date, format) {
- if (!(date instanceof Date)) return date;
+ if (isString(date) && NUMBER_STRING.test(date)) {
+ date = parseInt(date, 10);
+ }
+
+ if (isNumber(date)) {
+ date = new Date(date);
+ } else if (!(date instanceof Date)) {
+ return date;
+ }
+
var text = date.toLocaleDateString(), fn;
if (format && isString(format)) {
text = '';