diff options
| -rw-r--r-- | src/filters.js | 2 | ||||
| -rw-r--r-- | test/FiltersSpec.js | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/filters.js b/src/filters.js index 7e0f2b42..5b734882 100644 --- a/src/filters.js +++ b/src/filters.js @@ -75,7 +75,7 @@ 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; + if (!(date instanceof Date)) return date; var text = date.toLocaleDateString(), fn; if (format && isString(format)) { text = ''; diff --git a/test/FiltersSpec.js b/test/FiltersSpec.js index 3e5ca9a6..fbaceac6 100644 --- a/test/FiltersSpec.js +++ b/test/FiltersSpec.js @@ -100,6 +100,12 @@ describe('filter', function(){ midnight.getTimezoneOffset = function() { return 7 * 60; }; + it('should ignore falsy inputs', function() { + expect(filter.date(null)).toEqual(null); + expect(filter.date('')).toEqual(''); + expect(filter.date(123)).toEqual(123); + }); + it('should do basic filter', function() { expect(filter.date(noon)).toEqual(noon.toLocaleDateString()); expect(filter.date(noon, '')).toEqual(noon.toLocaleDateString()); |