Merge remote-tracking branch 'origin/QA_4_1' into QA_4_1
This commit is contained in:
commit
515f4e86b5
40
js/rte.js
40
js/rte.js
@ -714,26 +714,28 @@ RTE.ROUTINE = {
|
||||
/*
|
||||
* Define the function if the user presses enter
|
||||
*/
|
||||
$('form.rte_form').live('submit', function (event) {
|
||||
$('form.rte_form').live('keyup', function (event) {
|
||||
event.preventDefault();
|
||||
/**
|
||||
* @var data Form data to be sent in the AJAX request
|
||||
*/
|
||||
var data = $(this).serialize();
|
||||
$msg = PMA_ajaxShowMessage(
|
||||
PMA_messages.strProcessingRequest
|
||||
);
|
||||
var url = $(this).attr('action');
|
||||
$.post(url, data, function (data) {
|
||||
if (data.success === true) {
|
||||
// Routine executed successfully
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
PMA_slidingMessage(data.message);
|
||||
$ajaxDialog.remove();
|
||||
} else {
|
||||
PMA_ajaxShowMessage(data.error, false);
|
||||
}
|
||||
});
|
||||
if (event.keyCode === 13) {
|
||||
/**
|
||||
* @var data Form data to be sent in the AJAX request
|
||||
*/
|
||||
var data = $(this).serialize();
|
||||
$msg = PMA_ajaxShowMessage(
|
||||
PMA_messages.strProcessingRequest
|
||||
);
|
||||
var url = $(this).attr('action');
|
||||
$.post(url, data, function (data) {
|
||||
if (data.success === true) {
|
||||
// Routine executed successfully
|
||||
PMA_ajaxRemoveMessage($msg);
|
||||
PMA_slidingMessage(data.message);
|
||||
$ajaxDialog.remove();
|
||||
} else {
|
||||
PMA_ajaxShowMessage(data.error, false);
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
} else {
|
||||
// Routine executed successfully
|
||||
|
||||
Loading…
Reference in New Issue
Block a user