Merge branch 'MDL-32917-master-nomerge3' of git://github.com/mouneyrac/moodle

This commit is contained in:
Damyon Wiese
2014-03-06 11:41:09 +08:00
4 changed files with 7 additions and 7 deletions
@@ -284,9 +284,9 @@ CALENDAR.prototype = {
var month = parseInt(this.monthselect.get('value'), 10) - 1;
var day = parseInt(this.dayselect.get('value'), 10);
var date = new Date(year, month, day);
M.form.dateselector.calendar.deselectDates();
M.form.dateselector.calendar.selectDates([date]);
M.form.dateselector.calendar.set("month", month);
M.form.dateselector.calendar.set("year", year);
M.form.dateselector.calendar.set("date", date);
M.form.dateselector.calendar.render();
if (date.getDate() !== day) {
// Must've selected the 29 to 31st of a month that doesn't have such dates.
File diff suppressed because one or more lines are too long
@@ -284,9 +284,9 @@ CALENDAR.prototype = {
var month = parseInt(this.monthselect.get('value'), 10) - 1;
var day = parseInt(this.dayselect.get('value'), 10);
var date = new Date(year, month, day);
M.form.dateselector.calendar.deselectDates();
M.form.dateselector.calendar.selectDates([date]);
M.form.dateselector.calendar.set("month", month);
M.form.dateselector.calendar.set("year", year);
M.form.dateselector.calendar.set("date", date);
M.form.dateselector.calendar.render();
if (date.getDate() !== day) {
// Must've selected the 29 to 31st of a month that doesn't have such dates.
+2 -2
View File
@@ -115,9 +115,9 @@ CALENDAR.prototype = {
var month = parseInt(this.monthselect.get('value'), 10) - 1;
var day = parseInt(this.dayselect.get('value'), 10);
var date = new Date(year, month, day);
M.form.dateselector.calendar.deselectDates();
M.form.dateselector.calendar.selectDates([date]);
M.form.dateselector.calendar.set("month", month);
M.form.dateselector.calendar.set("year", year);
M.form.dateselector.calendar.set("date", date);
M.form.dateselector.calendar.render();
if (date.getDate() !== day) {
// Must've selected the 29 to 31st of a month that doesn't have such dates.