aboutsummaryrefslogtreecommitdiffstats
path: root/src/filters.js
diff options
context:
space:
mode:
authorMisko Hevery2010-10-23 14:37:44 -0700
committerMisko Hevery2010-10-23 14:38:08 -0700
commit1391f19fb49275af59230afef51b472c58d7818c (patch)
treebb960cf6464262e34087af229aa47fa496047378 /src/filters.js
parent04a4d8b061d98f46dc97fb550d388d248845b369 (diff)
downloadangular.js-1391f19fb49275af59230afef51b472c58d7818c.tar.bz2
added support for treating numbers as date in miliseconds
Diffstat (limited to 'src/filters.js')
-rw-r--r--src/filters.js10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/filters.js b/src/filters.js
index 5b734882..7db5403c 100644
--- a/src/filters.js
+++ b/src/filters.js
@@ -75,8 +75,14 @@ var DATE_FORMATS = {
var DATE_FORMATS_SPLIT = /([^yMdHhmsaZ]*)(y+|M+|d+|H+|h+|m+|s+|a|Z)(.*)/;
angularFilter.date = function(date, format) {
- if (!(date instanceof Date)) return date;
- var text = date.toLocaleDateString(), fn;
+ var text, fn;
+ if (!date) return date;
+ if (!(date instanceof Date)) {
+ text = parseInt(date, 10);
+ date = new Date();
+ date.setTime(text);
+ }
+ text = date.toLocaleDateString();
if (format && isString(format)) {
text = '';
var parts = [];