moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-08 02:16:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-47739-master' of git://github.com/FMCorz/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2014-10-21 14:44:01 +13:00
commit 7a126c94a4
4 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-debug.js vendored
View file

@ -320,13 +320,14 @@ CALENDAR.prototype = {
M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true); M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true);
}, },
release_calendar: function(e) { release_calendar: function(e) {
var wasOwner = M.form.dateselector.currentowner === this;
M.form.dateselector.panel.hide(); M.form.dateselector.panel.hide();
M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date); M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date);
M.form.dateselector.calendar.hide(); M.form.dateselector.calendar.hide();
M.form.dateselector.currentowner = null; M.form.dateselector.currentowner = null;
// Put the focus back to the image calendar that we clicked. // Put the focus back to the image calendar that we clicked, only if it was visible.
if (e === null || typeof e === "undefined" || e.type !== "click") { if (wasOwner && (e === null || typeof e === "undefined" || e.type !== "click")) {
this.calendarimage.focus(); this.calendarimage.focus();
} }
}, },

4
lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector-min.js vendored
View file

File diff suppressed because one or more lines are too long

5
lib/form/yui/build/moodle-form-dateselector/moodle-form-dateselector.js vendored
View file

@ -320,13 +320,14 @@ CALENDAR.prototype = {
M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true); M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true);
}, },
release_calendar: function(e) { release_calendar: function(e) {
var wasOwner = M.form.dateselector.currentowner === this;
M.form.dateselector.panel.hide(); M.form.dateselector.panel.hide();
M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date); M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date);
M.form.dateselector.calendar.hide(); M.form.dateselector.calendar.hide();
M.form.dateselector.currentowner = null; M.form.dateselector.currentowner = null;
// Put the focus back to the image calendar that we clicked. // Put the focus back to the image calendar that we clicked, only if it was visible.
if (e === null || typeof e === "undefined" || e.type !== "click") { if (wasOwner && (e === null || typeof e === "undefined" || e.type !== "click")) {
this.calendarimage.focus(); this.calendarimage.focus();
} }
}, },

5
lib/form/yui/src/dateselector/js/calendar.js vendored
View file

@ -140,13 +140,14 @@ CALENDAR.prototype = {
M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true); M.form.dateselector.calendar.on('selectionChange', this.set_selects_from_date, this, true);
}, },
release_calendar: function(e) { release_calendar: function(e) {
var wasOwner = M.form.dateselector.currentowner === this;
M.form.dateselector.panel.hide(); M.form.dateselector.panel.hide();
M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date); M.form.dateselector.calendar.detach('selectionChange', this.set_selects_from_date);
M.form.dateselector.calendar.hide(); M.form.dateselector.calendar.hide();
M.form.dateselector.currentowner = null; M.form.dateselector.currentowner = null;
// Put the focus back to the image calendar that we clicked. // Put the focus back to the image calendar that we clicked, only if it was visible.
if (e === null || typeof e === "undefined" || e.type !== "click") { if (wasOwner && (e === null || typeof e === "undefined" || e.type !== "click")) {
this.calendarimage.focus(); this.calendarimage.focus();
} }
}, },