mirror of
https://github.com/moodle/moodle.git
synced 2025-04-13 20:42:22 +02:00
Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle
This commit is contained in:
commit
7a126c94a4
@ -320,13 +320,14 @@ CALENDAR.prototype = {
|
||||
M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true);
|
||||
},
|
||||
release_calendar: function(e) {
|
||||
var wasOwner = M.form.dateselector.currentowner === this;
|
||||
M.form.dateselector.panel.hide();
|
||||
M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date);
|
||||
M.form.dateselector.calendar.hide();
|
||||
M.form.dateselector.currentowner = null;
|
||||
|
||||
// Put the focus back to the image calendar that we clicked.
|
||||
if (e === null || typeof e === "undefined" || e.type !== "click") {
|
||||
// Put the focus back to the image calendar that we clicked, only if it was visible.
|
||||
if (wasOwner && (e === null || typeof e === "undefined" || e.type !== "click")) {
|
||||
this.calendarimage.focus();
|
||||
}
|
||||
},
|
||||
|
File diff suppressed because one or more lines are too long
@ -320,13 +320,14 @@ CALENDAR.prototype = {
|
||||
M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true);
|
||||
},
|
||||
release_calendar: function(e) {
|
||||
var wasOwner = M.form.dateselector.currentowner === this;
|
||||
M.form.dateselector.panel.hide();
|
||||
M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date);
|
||||
M.form.dateselector.calendar.hide();
|
||||
M.form.dateselector.currentowner = null;
|
||||
|
||||
// Put the focus back to the image calendar that we clicked.
|
||||
if (e === null || typeof e === "undefined" || e.type !== "click") {
|
||||
// Put the focus back to the image calendar that we clicked, only if it was visible.
|
||||
if (wasOwner && (e === null || typeof e === "undefined" || e.type !== "click")) {
|
||||
this.calendarimage.focus();
|
||||
}
|
||||
},
|
||||
|
5
lib/form/yui/src/dateselector/js/calendar.js
vendored
5
lib/form/yui/src/dateselector/js/calendar.js
vendored
@ -140,13 +140,14 @@ CALENDAR.prototype = {
|
||||
M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true);
|
||||
},
|
||||
release_calendar: function(e) {
|
||||
var wasOwner = M.form.dateselector.currentowner === this;
|
||||
M.form.dateselector.panel.hide();
|
||||
M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date);
|
||||
M.form.dateselector.calendar.hide();
|
||||
M.form.dateselector.currentowner = null;
|
||||
|
||||
// Put the focus back to the image calendar that we clicked.
|
||||
if (e === null || typeof e === "undefined" || e.type !== "click") {
|
||||
// Put the focus back to the image calendar that we clicked, only if it was visible.
|
||||
if (wasOwner && (e === null || typeof e === "undefined" || e.type !== "click")) {
|
||||
this.calendarimage.focus();
|
||||
}
|
||||
},
|
||||
|
Loading…
x
Reference in New Issue
Block a user