The branch, master has been updated via c9465ae77cfc79d482cb5ad4a2e138bc39c42e2c (commit) via d31133e60954de2513e1e720532d8709235d0b90 (commit) via b86f3c01f26d221fd010029dd02b331a477b76b3 (commit) via b4eac4ea1bec5027fb409340b6cd9f5bfa84aff4 (commit) from 7d106d4aa3ea4139f2621b517436689f4366f30a (commit)

- Log ----------------------------------------------------------------- commit c9465ae77cfc79d482cb5ad4a2e138bc39c42e2c Author: Michal Čihař mcihar@novell.com Date: Fri Apr 2 08:51:23 2010 +0200

Remove not used code paths.

commit d31133e60954de2513e1e720532d8709235d0b90 Author: Michal Čihař mcihar@novell.com Date: Fri Apr 2 08:50:51 2010 +0200

Whitespace cleanup.

commit b86f3c01f26d221fd010029dd02b331a477b76b3 Author: Michal Čihař mcihar@novell.com Date: Fri Apr 2 08:42:16 2010 +0200

Merge single function for replication into other js.

Separate js file with single function will only worse loading times.

commit b4eac4ea1bec5027fb409340b6cd9f5bfa84aff4 Author: Michal Čihař mcihar@novell.com Date: Fri Apr 2 08:38:48 2010 +0200

Add missing jQuery include.

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

Summary of changes: js/functions.js | 50 +++++++++++++++++++++++++++++------------------ js/mootools_common.js | 15 -------------- navigation.php | 1 + server_replication.php | 1 - 4 files changed, 32 insertions(+), 35 deletions(-) delete mode 100644 js/mootools_common.js

diff --git a/js/functions.js b/js/functions.js index 045e55a..8dea75d 100644 --- a/js/functions.js +++ b/js/functions.js @@ -576,26 +576,23 @@ function validateConnection(form_name, form_obj) { // All the text fields are checked excluding the port field because the default port can be used. if ((form_name.elements[i].type == 'text') && (form_name.elements[i].name != 'src_port') && (form_name.elements[i].name != 'trg_port')) { - check = true; check = emptyFormElements(form_obj, form_name.elements[i].name); - - if (check==false) { - element = form_name.elements[i].name; - if (form_name.elements[i].name == 'src_host') { - src_hostfilled = false; - continue; - } - if (form_name.elements[i].name == 'trg_host') { - trg_hostfilled = false; - continue; - } - if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) - break; - else - continue; - break; - } - } + if (check==false) { + element = form_name.elements[i].name; + if (form_name.elements[i].name == 'src_host') { + src_hostfilled = false; + continue; + } + if (form_name.elements[i].name == 'trg_host') { + trg_hostfilled = false; + continue; + } + if ((form_name.elements[i].name == 'src_socket' && src_hostfilled==false) || (form_name.elements[i].name == 'trg_socket' && trg_hostfilled==false)) + break; + else + continue; + } + } } if (!check) { form_obj.reset(); @@ -1678,3 +1675,18 @@ $(document).ready(function(){ $(".sql").html("<span class="syntax">"+$oldText+"</span>"); }); }); + +/** + * Used for replication support + * + * @version $Id$ + */ + +function divShowHideFunc(ahref, id) { + $(ahref).addEvent('click', function() { + if ($(id).getStyle('display')=="none") + $(id).tween('display', 'block'); + else + $(id).tween('display', 'none'); + }); +} diff --git a/js/mootools_common.js b/js/mootools_common.js deleted file mode 100644 index 8de3bdb..0000000 --- a/js/mootools_common.js +++ /dev/null @@ -1,15 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * Used for replication support - * - * @version $Id$ - */ - -function divShowHideFunc(ahref, id) { - $(ahref).addEvent('click', function() { - if ($(id).getStyle('display')=="none") - $(id).tween('display', 'block'); - else - $(id).tween('display', 'none'); - }); -} diff --git a/navigation.php b/navigation.php index 8fcc7ab..82f7f95 100644 --- a/navigation.php +++ b/navigation.php @@ -151,6 +151,7 @@ require_once './libraries/header_http.inc.php'; <base target="frame_content" /> <link rel="stylesheet" type="text/css" href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&amp;js_frame=left&amp;nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> + <script src="./js/jquery/jquery-1.4.2-min.js" type="text/javascript"></script> <script type="text/javascript" src="js/navigation.js"></script> <script type="text/javascript" src="js/functions.js"></script> <script type="text/javascript"> diff --git a/server_replication.php b/server_replication.php index 5dd4212..7397d76 100644 --- a/server_replication.php +++ b/server_replication.php @@ -17,7 +17,6 @@ require_once './libraries/common.inc.php'; $GLOBALS['js_include'][] = 'server_privileges.js'; $GLOBALS['js_include'][] = 'functions.js'; $GLOBALS['js_include'][] = 'mootools-more.js'; -$GLOBALS['js_include'][] = 'mootools_common.js';

require './libraries/server_common.inc.php'; require './libraries/replication.inc.php';

hooks/post-receive