Merge pull request #146 from Cobrowser/master

Support from date in time ago filter
urish · Jul 28, 2015 · a0880ae · a0880ae
2 parents f17e607 + 3b9acb5
commit a0880ae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/angular-moment.js b/angular-moment.js
@@ -551,17 +551,24 @@
 		 * @function
 		 */
 			.filter('amTimeAgo', ['moment', 'amMoment', 'angularMomentConfig', function (moment, amMoment, angularMomentConfig) {
-				function amTimeAgoFilter(value, preprocess, suffix) {
+				function amTimeAgoFilter(value, preprocess, suffix, from) {
+					var date, dateFrom;
+
 					if (typeof value === 'undefined' || value === null) {
 						return '';
 					}
 
 					value = amMoment.preprocessDate(value, preprocess);
-					var date = moment(value);
+					date = moment(value);
 					if (!date.isValid()) {
 						return '';
 					}
 
+					dateFrom = moment(from);
+					if (typeof from !== 'undefined' && dateFrom.isValid()) {
+						return amMoment.applyTimezone(date).from(dateFrom, suffix);
+					}
+
 					return amMoment.applyTimezone(date).fromNow(suffix);
 				}
 

diff --git a/tests.js b/tests.js
@@ -652,6 +652,13 @@ describe('module angularMoment', function () {
 			expect(amTimeAgo(date, null, true)).toBe('a few seconds');
 		});
 
+		it('should support started date as fourth parameter', function () {
+			var date = new Date(2015, 7, 14),
+			  from = new Date(2015, 7, 15);
+			expect(amTimeAgo(date, null, null, from)).toBe('a day ago');
+			expect(amTimeAgo(date, null, true, from)).toBe('a day');
+		});
+
 		it('should gracefully handle undefined values', function () {
 			expect(amTimeAgo()).toBe('');
 		});