From a1b6794307941b83731b8e91d01e486a36b0a3fb Mon Sep 17 00:00:00 2001 From: Adam Shaw Date: Sun, 3 Aug 2014 14:31:10 -0700 Subject: [PATCH] camelcase "HTML" in certain places --- lang/fr.js | 5 ++++- src/agenda/AgendaView.js | 2 +- src/lang.js | 6 +++--- src/util.js | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/lang/fr.js b/lang/fr.js index 41b9db3..f9bfe57 100644 --- a/lang/fr.js +++ b/lang/fr.js @@ -6,6 +6,9 @@ $.fullCalendar.lang("fr", { day: "Jour", list: "Mon planning" }, - allDayHTML: "Toute la journée",// allDayHTML is discouraged but used here as a hack to get the breaking correct + + // allDayHTML is discouraged but used here as a hack to get the breaking correct + allDayHtml: "Toute la journée", + eventLimitText: "en plus" }); diff --git a/src/agenda/AgendaView.js b/src/agenda/AgendaView.js index 98dadc7..da8b4d0 100644 --- a/src/agenda/AgendaView.js +++ b/src/agenda/AgendaView.js @@ -194,7 +194,7 @@ $.extend(AgendaView.prototype, { return '' + '' + '' + // needed for matchCellWidths - (this.opt('allDayHTML') || htmlEscape(this.opt('allDayText'))) + + (this.opt('allDayHtml') || htmlEscape(this.opt('allDayText'))) + '' + ''; }, diff --git a/src/lang.js b/src/lang.js index de1485f..6ac8753 100644 --- a/src/lang.js +++ b/src/lang.js @@ -25,9 +25,9 @@ fc.datepickerLang = function(langCode, datepickerLangCode, options) { }, defaultButtonText: { // the translations sometimes wrongly contain HTML entities - prev: stripHTMLEntities(options.prevText), - next: stripHTMLEntities(options.nextText), - today: stripHTMLEntities(options.currentText) + prev: stripHtmlEntities(options.prevText), + next: stripHtmlEntities(options.nextText), + today: stripHtmlEntities(options.currentText) } }); diff --git a/src/util.js b/src/util.js index 88df8e3..d052b87 100644 --- a/src/util.js +++ b/src/util.js @@ -304,7 +304,7 @@ function htmlEscape(s) { } -function stripHTMLEntities(text) { +function stripHtmlEntities(text) { return text.replace(/&.*?;/g, ''); }