Merge pull request #241 from Nitro-N/am_calendar_advanced_arguments

amCalendar. Advanced arguments referenceTime, formats added

README.md

@@ -171,7 +171,7 @@ For more information about Moment.JS formatting options, see the
 Format dates using moment.js calendar() method. Example:
 
 ```html
-<span>{{message.time | amCalendar}}</span>
+<span>{{message.time | amCalendar:referenceTime:formats}}</span>
 ```
 
 This snippet will format the given time as e.g. "Today 2:30 AM" or "Last Monday 2:30 AM" etc..

angular-moment.js

@@ -519,13 +519,13 @@
 		 * @module angularMoment
 		 */
 			.filter('amCalendar', ['moment', 'amMoment', 'angularMomentConfig', function (moment, amMoment, angularMomentConfig) {
-				function amCalendarFilter(value) {
+				function amCalendarFilter(value, referenceTime, formats) {
 					if (isUndefinedOrNull(value)) {
 						return '';
 					}
 
 					var date = amMoment.preprocessDate(value);
-					return date.isValid() ? date.calendar() : '';
+					return date.isValid() ? date.calendar(referenceTime, formats) : '';
 				}
 
 				// Since AngularJS 1.3, filters have to explicitly define being stateful

tests.js

@@ -562,6 +562,10 @@ describe('module angularMoment', function () {
 		it('should return an empty string for invalid input', function () {
 			expect(amCalendar('blah blah')).toBe('');
 		});
+
+		it('should take advanced arguments referenceTime and formats', function () {
+			expect(amCalendar(new Date(2012, 0, 22, 4, 46, 54), new Date(2012, 0, 23, 4, 46, 54), {lastDay: '[Yesterday at] H:m'})).toBe('Yesterday at 4:46');
+		});
 	});
 
 	describe('amDifference filter', function () {