aboutsummaryrefslogtreecommitdiffstats
path: root/src/filters.js
diff options
context:
space:
mode:
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 = '';