diff --git a/js/ajax.js b/js/ajax.js index 39a05cb87c..5af4affcde 100644 --- a/js/ajax.js +++ b/js/ajax.js @@ -397,6 +397,15 @@ var AJAX = { $('
', {id : 'pma_errors'}) .insertAfter('#selflink') .append(data._errors); + // bind for php error reporting forms (bottom) + $("#pma_ignore_errors_bottom").bind("click", + function() { + PMA_ignorePhpErrors() + }); + $("#pma_ignore_all_errors_bottom").bind("click", + function() { + PMA_ignorePhpErrors(false) + }); // In case of 'sendErrorReport'='always' // submit the hidden error reporting form. if (data._sendErrorAlways == '1' @@ -412,6 +421,13 @@ var AJAX = { } } PMA_ajaxShowMessage(msg, false); + // bind for php error reporting forms (popup) + $("#pma_ignore_errors_popup").bind("click", function() { + PMA_ignorePhpErrors() + }); + $("#pma_ignore_all_errors_popup").bind("click", function() { + PMA_ignorePhpErrors(false) + }); if (typeof AJAX._callback === 'function') { AJAX._callback.call(); diff --git a/js/messages.php b/js/messages.php index 9fd159726c..59146e83bc 100644 --- a/js/messages.php +++ b/js/messages.php @@ -430,12 +430,12 @@ $js_messages['phpErrorsFound'] = '
' . __('Warning: Some errors have been detected on the server!!') . '
' . __('Please look at the bottom of this window.') - . '' - . '' + . '' + . '" style="float: right; margin: 20px;">' . '
'; $js_messages['phpErrorsBeingSubmitted'] = '
' diff --git a/libraries/Error_Handler.class.php b/libraries/Error_Handler.class.php index 0d34dc972c..5eca90caba 100644 --- a/libraries/Error_Handler.class.php +++ b/libraries/Error_Handler.class.php @@ -338,14 +338,12 @@ class PMA_Error_Handler // add ignore buttons $retval .= ''; } $retval .= ''; } return $retval; @@ -527,9 +525,21 @@ class PMA_Error_Handler } elseif ($GLOBALS['cfg']['SendErrorReports'] == 'ask') { //ask user whether to submit errors or not. if (!$response->isAjax()) { - // js code to show appropriate msgs & focusing, + // js code to show appropriate msgs, event binding & focusing. $jsCode = 'PMA_ajaxShowMessage(PMA_messages["phpErrorsFound"], ' . ' 2000);' + . '$("#pma_ignore_errors_popup").bind("click", function() { + PMA_ignorePhpErrors() + });' + . '$("#pma_ignore_all_errors_popup").bind("click", function() { + PMA_ignorePhpErrors(false) + });' + . '$("#pma_ignore_errors_bottom").bind("click", function() { + PMA_ignorePhpErrors() + });' + . '$("#pma_ignore_all_errors_bottom").bind("click", function() { + PMA_ignorePhpErrors(false) + });' . '$("html, body").animate({ scrollTop:$(document).height() }, "slow");';