diff --git a/js/tbl_structure.js b/js/tbl_structure.js index c34a6b801c..96e19ed59b 100644 --- a/js/tbl_structure.js +++ b/js/tbl_structure.js @@ -22,6 +22,8 @@ * Unbind all event handlers before tearing down a page */ AJAX.registerTeardown('tbl_structure.js', function() { + $("a.change_column_anchor.ajax").die('click'); + $("button.change_columns_anchor.ajax, input.change_columns_anchor.ajax").die('click'); $("a.drop_column_anchor.ajax").die('click'); $("a.add_primary_key_anchor.ajax").die('click'); $('a.drop_primary_key_index_anchor.ajax').die('click'); @@ -31,6 +33,48 @@ AJAX.registerTeardown('tbl_structure.js', function() { }); AJAX.registerOnload('tbl_structure.js', function() { + /** + * Attach Event Handler for 'Change Column' + * + * (see $GLOBALS['cfg']['AjaxEnable']) + */ + $("a.change_column_anchor.ajax").live('click', function(event) { + event.preventDefault(); + $('#page_content').hide(); + $.get($(this).attr('href'), {'ajax_request': true}, function(data) { + if (data.success) { + $('
') + .html(data.message) + .insertBefore('#page_content'); + PMA_verifyColumnsProperties(); + } else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); + } + }); + }); + + /** + * Attach Event Handler for 'Change multiple columns' + * + * (see $GLOBALS['cfg']['AjaxEnable']) + */ + $("button.change_columns_anchor.ajax, input.change_columns_anchor.ajax").live('click', function(event) { + event.preventDefault(); + $('#page_content').hide(); + var $form = $(this).closest('form'); + var params = $form.serialize() + "&ajax_request=true&submit_mult=change"; + $.post($form.prop("action"), params, function (data) { + if (data.success) { + $('
') + .html(data.message) + .insertBefore('#page_content'); + PMA_verifyColumnsProperties(); + } else { + PMA_ajaxShowMessage(PMA_messages['strErrorProcessingRequest'] + " : " + data.error, false); + } + }); + }); + /** * Attach Event Handler for 'Drop Column' * @@ -356,6 +400,7 @@ function reloadFieldForm(message) { PMA_ajaxShowMessage(message); }, 500); }); + $('#page_content').show(); } /** diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 5287386b35..1da643eab2 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -2321,7 +2321,7 @@ class PMA_Util * Generate a button or image tag * * @param string $button_name name of button element - * @param string $button_class class of button element + * @param string $button_class class of button or image element * @param string $image_name name of image element * @param string $text text to display * @param string $image image to display @@ -2348,6 +2348,7 @@ class PMA_Util /* IE (before version 9) has trouble with