Browse Source

eventLimitPopoverFormat option. eventLimitText RTL behavior change

Adam Shaw 11 years ago
parent
commit
81ea523fc3
3 changed files with 6 additions and 9 deletions
  1. 2 1
      src/basic/MonthView.js
  2. 2 7
      src/common/DayGrid.limit.js
  3. 2 1
      src/defaults.js

+ 2 - 1
src/basic/MonthView.js

@@ -6,7 +6,8 @@ setDefaults({
 	fixedWeekCount: true,
 	eventLimit: false,
 	eventLimitText: 'more',
-	eventLimitClick: 'popover'
+	eventLimitClick: 'popover',
+	eventLimitPopoverFormat: 'LL'
 });
 
 fcViews.month = MonthView; // register the view

+ 2 - 7
src/common/DayGrid.limit.js

@@ -248,7 +248,7 @@ $.extend(DayGrid.prototype, {
 	renderSegPopoverContent: function(date, segs) {
 		var view = this.view;
 		var isTheme = view.opt('theme');
-		var title = date.format('LL'); // TODO: make this an option somehow
+		var title = date.format(view.opt('eventLimitPopoverFormat'));
 		var content = $(
 			'<div class="fc-header ' + view.widgetHeaderClass + '">' +
 				'<span class="fc-close ' +
@@ -300,12 +300,7 @@ $.extend(DayGrid.prototype, {
 			return opt(num);
 		}
 		else {
-			if (view.opt('isRTL')) {
-				return opt + ' ' + num + '+';
-			}
-			else {
-				return '+' + num + ' ' + opt;
-			}
+			return '+' + num + ' ' + opt;
 		}
 	},
 

+ 2 - 1
src/defaults.js

@@ -123,7 +123,8 @@ var langOptionHash = {
 	en: {
 		columnFormat: {
 			week: 'ddd M/D' // override for english. different from the generated default, which is MM/DD
-		}
+		},
+		eventLimitPopoverFormat: 'dddd, MMMM D, YYYY'
 	}
 };