mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 04:33:13 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip-MDL-30912-master' of git://github.com/abgreeve/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-07-03 12:11:48 +08:00
commit 3da087a8b4
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/javascript-static.js
View File

@ -381,26 +381,26 @@ M.util.init_select_autosubmit = function(Y, formid, selectid, nothing) {
if ((nothing===false || select.get('value') != nothing) && paramobject.lastindex != select.get('selectedIndex')) {
//prevent event bubbling and detach handlers to prevent multiple submissions caused by double clicking
e.halt();
paramobject.eventkeypress.detach();
paramobject.eventblur.detach();
paramobject.eventchangeorblur.detach();
this.submit();
}
};
// Attach the change event to the keypress, blur, and click actions.
var changedown = function(e, paramobject) {
if ((nothing===false || select.get('value') != nothing) && paramobject.lastindex != select.get('selectedIndex')) {
if(e.keyCode == 13) {
form.submit();
}
}
}
// Attach the change event to the keydown and click actions.
// We don't use the change event because IE fires it on every arrow up/down
// event.... usability
var paramobject = new Object();
paramobject.lastindex = select.get('selectedIndex');
paramobject.eventkeypress = Y.on('key', processchange, select, 'press:13', form, paramobject);
paramobject.eventblur = select.on('blur', processchange, form, paramobject);
//little hack for chrome that need onChange event instead of onClick - see MDL-23224
if (Y.UA.webkit) {
paramobject.eventchangeorblur = select.on('change', processchange, form, paramobject);
} else {
paramobject.eventchangeorblur = select.on('click', processchange, form, paramobject);
}
paramobject.eventchangeorblur = select.on('click', processchange, form, paramobject);
paramobject.eventkeypress = Y.on('keydown', changedown, select, '', form, paramobject);
}
}
});
@ -408,6 +408,9 @@ M.util.init_select_autosubmit = function(Y, formid, selectid, nothing) {
/**
* Attach handler to url_select
* Deprecated from 2.3 onwards.
* Please use @see init_select_autosubmit() for redirecting to a url (above).
* This function has accessability issues and also does not use the formid passed through as a parameter.
*/
M.util.init_url_select = function(Y, formid, selectid, nothing) {
YUI(M.yui.loader).use('node', function(Y) {

2
lib/outputrenderers.php
View File

@ -1472,7 +1472,7 @@ class core_renderer extends renderer_base {
$go = html_writer::empty_tag('input', array('type'=>'submit', 'value'=>get_string('go')));
$output .= html_writer::tag('noscript', html_writer::tag('div', $go), array('style'=>'inline'));
$nothing = empty($select->nothing) ? false : key($select->nothing);
$output .= $this->page->requires->js_init_call('M.util.init_url_select', array($select->formid, $select->attributes['id'], $nothing));
$output .= $this->page->requires->js_init_call('M.util.init_select_autosubmit', array($select->formid, $select->attributes['id'], $nothing));
} else {
$output .= html_writer::empty_tag('input', array('type'=>'submit', 'value'=>$select->showbutton));
}