The branch, master has been updated via 9fda4bb515ccc3a257ff13f43deba5cbcd22eef2 (commit) from d2a2be7764e430d557e3ed5fef03bbb37b5950ac (commit)

- Log ----------------------------------------------------------------- commit 9fda4bb515ccc3a257ff13f43deba5cbcd22eef2 Author: sutharshan sutharshan02@users.sourceforge.net Date: Sun Apr 11 11:16:03 2010 +0200

Convert loading of export/import to jQuery ready event.

This way it is done after document is fully loaded and no race conditions can appear as with inline js.

patch #2984337, bug #2983446

-----------------------------------------------------------------------

Summary of changes: ChangeLog | 2 ++ libraries/display_export.lib.php | 5 ----- libraries/display_import.lib.php | 5 ----- libraries/plugin_interface.lib.php | 2 ++ 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog index 9d9b8ae..978695d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -63,6 +63,8 @@ $Id$ thanks to Brian Douglass - bhdouglass + patch #2984058 [edit] Buttons for quicky creating common SQL queries, thanks to sutharshan. ++ patch #2984337 [interface] Convert loading of export/import to jQuery ready + event, thanks to sutharshan.

3.3.3.0 (not yet released) - patch #2982480 [navi] Do not group if there would be one table in group, diff --git a/libraries/display_export.lib.php b/libraries/display_export.lib.php index 186b0d3..649a358 100644 --- a/libraries/display_export.lib.php +++ b/libraries/display_export.lib.php @@ -98,11 +98,6 @@ echo PMA_pluginGetJavascript($export_list); </div> </td></tr></table>

-<script type="text/javascript"> -//<![CDATA[ - init_options(); -//]]> -</script>

<?php if (strlen($table) && ! isset($num_tables) && ! PMA_Table::isMerge($db, $table)) { ?> <div class="formelementrow"> diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php index a1989cb..11bf9ef 100644 --- a/libraries/display_import.lib.php +++ b/libraries/display_import.lib.php @@ -279,8 +279,3 @@ echo "\n"; </fieldset> </form> </div> -<script type="text/javascript"> -//<![CDATA[ - init_options(); -//]]> -</script> diff --git a/libraries/plugin_interface.lib.php b/libraries/plugin_interface.lib.php index 38e8153..e3b711e 100644 --- a/libraries/plugin_interface.lib.php +++ b/libraries/plugin_interface.lib.php @@ -370,6 +370,8 @@ function PMA_pluginGetJavascript(&$list) { } } } + + $(document).ready(init_options); //]]> </script> ';

hooks/post-receive