diff --git a/js/tbl_structure.js b/js/tbl_structure.js index ebbd6291cd..b4da44b3ef 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -88,11 +88,14 @@ AJAX.registerOnload('tbl_structure.js', function() { $("a.change_column_anchor.ajax").live('click', function(event) { event.preventDefault(); $('#page_content').hide(); - $.get($(this).attr('href'), {'ajax_request': true}, function(data) { + $.get($(this).attr('href'), {'ajax_request': true, 'ajax_page_request': true}, function(data) { if (data.success) { $('
') .html(data.message) .insertBefore('#page_content'); + if (data._scripts) { + AJAX.scriptHandler.load(data._scripts); + } PMA_verifyColumnsProperties(); } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); @@ -107,12 +110,15 @@ AJAX.registerOnload('tbl_structure.js', function() { event.preventDefault(); $('#page_content').hide(); var $form = $(this).closest('form'); - var params = $form.serialize() + "&ajax_request=true&submit_mult=change"; + var params = $form.serialize() + "&ajax_request=true&ajax_page_request=true&submit_mult=change"; $.post($form.prop("action"), params, function (data) { if (data.success) { $('
') .html(data.message) .insertBefore('#page_content'); + if (data._scripts) { + AJAX.scriptHandler.load(data._scripts); + } PMA_verifyColumnsProperties(); } else { PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); diff --git a/tbl_addfield.php b/tbl_addfield.php index 25f54c2681..622193aaeb 100644 --- a/tbl_addfield.php +++ b/tbl_addfield.php @@ -12,7 +12,13 @@ require_once 'libraries/common.inc.php'; // Check parameters PMA_Util::checkParameters(array('db', 'table')); - +/** + * Load JavaScript files + */ +$response = PMA_Response::getInstance(); +$header = $response->getHeader(); +$scripts = $header->getScripts(); +$scripts->addFile('keyhandler.js'); /** * Defines the url to return to in case of error in a sql statement diff --git a/tbl_structure.php b/tbl_structure.php index f7b9b31325..8dcab60e6b 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -39,6 +39,7 @@ if (isset($_REQUEST['move_columns']) * A click on Change has been made for one column */ if (isset($_REQUEST['change_column'])) { + $scripts->addFile('keyhandler.js'); PMA_displayHtmlForColumnChange($db, $table, null, 'tbl_structure.php'); exit; } @@ -62,7 +63,8 @@ if (isset($_REQUEST['do_save_data'])) { * * submit_mult_*_x comes from IE if is used */ -if (isset($_REQUEST['submit_mult_change_x'])) { +if (isset($_REQUEST['submit_mult']) && $_REQUEST['submit_mult'] == 'change') { + $scripts->addFile('keyhandler.js'); $submit_mult = 'change'; } elseif (isset($_REQUEST['submit_mult_drop_x'])) { $submit_mult = 'drop';