webapp/phpmyadmin
1
0
Fork 0
mirror of https://github.com/phpmyadmin/phpmyadmin.git synced 2026-10-28 07:41:55 +03:00
Code Activity

Fix merge conflicts

Browse Source 
Signed-off-by: Marc Delisle <marc@infomarc.info>
This commit is contained in:
Marc Delisle
2014-04-12 07:27:53 -04:00
parent 8ef8fbfbc8 6e241b8411
commit d6592b5eb2
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
js/functions.js
View File

@@ -3871,17 +3871,19 @@ AJAX.registerOnload('functions.js', function () {
* Attach Ajax event handlers for input fields in the editor
* and used to submit the Ajax request when the ENTER key is pressed.
*/
$('#createViewDialog').find('input, select').live('keydown', function (e) {
if (e.which === 13) { // 13 is the ENTER key
e.preventDefault();
if ($('#createViewDialog').length !== 0) {
$('#createViewDialog').find('input, select').live('keydown', function (e) {
if (e.which === 13) { // 13 is the ENTER key
e.preventDefault();
// with preventing default, selection by <select> tag
// was also prevented in IE
$(this).blur();
// with preventing default, selection by <select> tag
// was also prevented in IE
$(this).blur();
$(this).closest('.ui-dialog').find('.ui-button:first').click();
}
}); // end $.live()
$(this).closest('.ui-dialog').find('.ui-button:first').click();
}
}); // end $.live()
}
var $elm = $('textarea[name="view[as]"]');
if ($elm.length > 0) {

2
js/rte.js
View File

@@ -757,8 +757,6 @@ RTE.ROUTINE = {
/**
* Attach Ajax event handlers for the Routines, Triggers and Events editor
*
* FIXME: submit on ENTER keypress in dialog
*/
$(function () {
/**