Merge pull request #52 from otang/default-format

Add default format (angularMomentConfig.format config property)

angular-moment.js

@@ -46,7 +46,20 @@
 				 * The default timezone (e.g. 'Europe/London'). Empty string by default (does not apply
 				 * any timezone shift).
 				 */
-				timezone: ''
+				timezone: '',
+
+				/**
+				 * @ngdoc property
+				 * @name angularMoment.config.angularMomentConfig#format
+				 * @propertyOf angularMoment.config:angularMomentConfig
+				 * @returns {string} The pre-conversion format of the date
+				 *
+				 * @description
+				 * Specify the format of the input date. Essentially it's a
+				 * default and saves you from specifying a format in every
+				 * element. Overridden by element attr. Null by default.
+				 */
+				format: null
 			})
 
 		/**
@@ -91,7 +104,7 @@
 				return function (scope, element, attr) {
 					var activeTimeout = null;
 					var currentValue;
-					var currentFormat;
+					var currentFormat = angularMomentConfig.format;
 					var withoutSuffix = amTimeAgoConfig.withoutSuffix;
 					var preprocess = angularMomentConfig.preprocess;
 
@@ -152,8 +165,10 @@
 					}
 
 					attr.$observe('amFormat', function (format) {
-						currentFormat = format;
-						updateMoment();
+						if(typeof format !== 'undefined') {
+							currentFormat = format;
+							updateMoment();
+						}
 					});
 
 					attr.$observe('amPreprocess', function (newValue) {
@@ -333,3 +348,4 @@
 		angularMoment(angular, window.moment);
 	}
 })();
+

tests.js

@@ -248,6 +248,28 @@ describe('module angularMoment', function () {
 				expect(element.text()).toBe('a month ago');
 			});
 		});
+
+		describe('format config property', function () {
+			it('should be used when no `am-format` attribute is found', function () {
+				angularMomentConfig.format = 'MM@YYYY@DD';
+				var today = new Date();
+				$rootScope.testDate = today.getMonth() + '@' + today.getFullYear() + '@' + today.getDate();
+				var element = angular.element('<span am-time-ago="testDate"></span>');
+				element = $compile(element)($rootScope);
+				$rootScope.$digest();
+				expect(element.text()).toBe('a month ago');
+			});
+
+			it('should be overridable by `am-format` attribute', function () {
+				angularMomentConfig.format = 'YYYY@MM@@DD';
+				var today = new Date();
+				$rootScope.testDate = today.getMonth() + '@' + today.getFullYear() + '@' + today.getDate();
+				var element = angular.element('<span am-format="MM@YYYY@DD" am-time-ago="testDate"></span>');
+				element = $compile(element)($rootScope);
+				$rootScope.$digest();
+				expect(element.text()).toBe('a month ago');
+			});
+		});
 	});
 
 	describe('amCalendar filter', function () {
@@ -413,7 +435,7 @@ describe('module angularMoment', function () {
 				amMoment.preprocessors.foobar = function (value) {
 					return moment(value.date);
 				};
-				
+
 				expect(amMoment.preprocessDate(meeting, 'foobar').valueOf()).toEqual(testDate.getTime());
 			});