The branch, master has been updated via e311848262b6e5e095a331818f1da4ba54c22f74 (commit) from 2064f09f4273292c166d23c788bfbc1f9e023aaa (commit)
- Log ----------------------------------------------------------------- commit e311848262b6e5e095a331818f1da4ba54c22f74 Author: Marc Delisle marc@infomarc.info Date: Tue Jan 25 13:06:17 2011 -0500
Conditional Ajax on table create
-----------------------------------------------------------------------
Summary of changes: js/functions.js | 6 +++--- libraries/display_create_table.lib.php | 2 +- libraries/tbl_properties.inc.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/js/functions.js b/js/functions.js index 782c725..bf10aaa 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1665,7 +1665,7 @@ $(document).ready(function() { * * @uses PMA_ajaxShowMessage() */ - $("#create_table_form_minimal").live('submit', function(event) { + $("#create_table_form_minimal.ajax").live('submit', function(event) { event.preventDefault(); $form = $(this);
@@ -1708,7 +1708,7 @@ $(document).ready(function() { * */ // .live() must be called after a selector, see http://api.jquery.com/live - $("#create_table_form input[name=do_save_data]").live('click', function(event) { + $("#create_table_form.ajax input[name=do_save_data]").live('click', function(event) { event.preventDefault();
/** @@ -1788,7 +1788,7 @@ $(document).ready(function() { * */ // .live() must be called after a selector, see http://api.jquery.com/live - $("#create_table_form input[name=submit_num_fields]").live('click', function(event) { + $("#create_table_form.ajax input[name=submit_num_fields]").live('click', function(event) { event.preventDefault();
/** diff --git a/libraries/display_create_table.lib.php b/libraries/display_create_table.lib.php index 962632c..5ec2d9a 100644 --- a/libraries/display_create_table.lib.php +++ b/libraries/display_create_table.lib.php @@ -36,7 +36,7 @@ require_once './libraries/check_user_privileges.lib.php'; $is_create_table_priv = true;
?> -<form id="create_table_form_minimal" method="post" action="tbl_create.php"> + <form id="create_table_form_minimal" method="post" action="tbl_create.php"<?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> <fieldset> <legend> <?php diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index 4b71fb4..c6446ea 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -606,7 +606,7 @@ document.onkeydown = onKeyDownArrowsHandler; // ]]> </script>
-<form id="<?php echo ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form" method="post" action="<?php echo $action; ?>"> + <form id="<?php echo ($action == 'tbl_create.php' ? 'create_table' : 'append_fields'); ?>_form" method="post" action="<?php echo $action; ?>" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : ''); ?>> <?php echo PMA_generate_common_hidden_inputs($_form_params); unset($_form_params);
hooks/post-receive