[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_2-15890-gfd13e7a
Michal Čihař
nijel at users.sourceforge.net
Fri Aug 19 13:25:20 CEST 2011
The branch, master has been updated
via fd13e7ad67215df22983942163cfff80712637a0 (commit)
via 1fdc278e023e2c64616986bf406020ed8f6a996a (commit)
from 99e979b373f85a10988018cbe0dd320640510489 (commit)
- Log -----------------------------------------------------------------
commit fd13e7ad67215df22983942163cfff80712637a0
Author: Michal Čihař <michal at cihar.com>
Date: Fri Aug 19 13:25:08 2011 +0200
Use display = none instead of visibility to avoid off screen invisible elements
commit 1fdc278e023e2c64616986bf406020ed8f6a996a
Author: Michal Čihař <michal at cihar.com>
Date: Fri Aug 19 13:22:10 2011 +0200
Get rid of useless variable
-----------------------------------------------------------------------
Summary of changes:
js/pmd/move.js | 30 +++++++++++++++---------------
pmd_general.php | 31 +++++++++++++++----------------
2 files changed, 30 insertions(+), 31 deletions(-)
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 6f30293..e41b107 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -113,7 +113,7 @@ function MouseDown(e)
dx = offsetx - parseInt(cur_click.style.left);
dy = offsety - parseInt(cur_click.style.top);
//alert(" dx = " + dx + " dy = " +dy);
- document.getElementById("canvas").style.visibility = 'hidden';
+ document.getElementById("canvas").style.display = 'none';
/*
var left = parseInt(cur_click.style.left);
var top = parseInt(cur_click.style.top);
@@ -173,7 +173,7 @@ function MouseMove(e)
function MouseUp(e)
{
if (cur_click != null) {
- document.getElementById("canvas").style.visibility = 'visible';
+ document.getElementById("canvas").style.display = 'inline-block';
Re_load();
cur_click.style.zIndex = 1;
cur_click = null;
@@ -605,7 +605,7 @@ function Click_field(T, f, PK) // table field
function New_relation()
{
- document.getElementById('layer_new_relation').style.visibility = 'hidden';
+ document.getElementById('layer_new_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0';
link_relation += '&on_delete=' + document.getElementById('on_delete').value + '&on_update=' + document.getElementById('on_update').value;
link_relation += Get_url_pos();
@@ -776,14 +776,14 @@ function Canvas_click(id)
document.getElementById('layer_upd_relation').style.left = left + 'px';
var top = Glob_Y - document.getElementById('layer_upd_relation').offsetHeight - 10;
document.getElementById('layer_upd_relation').style.top = top + 'px';
- document.getElementById('layer_upd_relation').style.visibility = 'visible';
+ document.getElementById('layer_upd_relation').style.display = 'block';
link_relation = 'T1=' + Key0 + '&F1=' + Key1 + '&T2=' + Key2 + '&F2=' + Key3 + '&K=' + Key;
}
}
function Upd_relation()
{
- document.getElementById('layer_upd_relation').style.visibility = 'hidden';
+ document.getElementById('layer_upd_relation').style.display = 'none';
link_relation += '&server=' + server + '&db=' + db + '&token=' + token + '&die_save_pos=0';
link_relation += Get_url_pos();
makeRequest('pmd_relation_upd.php', link_relation);
@@ -792,9 +792,9 @@ function Upd_relation()
function VisibleTab(id, t_n)
{
if (id.checked) {
- document.getElementById(t_n).style.visibility = 'visible';
+ document.getElementById(t_n).style.display = 'block';
} else {
- document.getElementById(t_n).style.visibility = 'hidden';
+ document.getElementById(t_n).style.display = 'none';
}
Re_load();
}
@@ -813,10 +813,10 @@ function Hide_tab_all(id_this) // max/min all tables
if (E.elements[i].type == "checkbox" && E.elements[i].id.substring(0, 10) == 'check_vis_') {
if (id_this.alt == 'v') {
E.elements[i].checked = true;
- document.getElementById(E.elements[i].value).style.visibility = 'visible';
+ document.getElementById(E.elements[i].value).style.display = 'block';
} else {
E.elements[i].checked = false;
- document.getElementById(E.elements[i].value).style.visibility = 'hidden';
+ document.getElementById(E.elements[i].value).style.display = 'none';
}
}
}
@@ -859,10 +859,10 @@ function No_have_constr(id_this)
if (!in_array_k(E.elements[i].value, a))
if (id_this.alt == 'v') {
E.elements[i].checked = true;
- document.getElementById(E.elements[i].value).style.visibility = 'visible';
+ document.getElementById(E.elements[i].value).style.display = 'block';
} else {
E.elements[i].checked = false;
- document.getElementById(E.elements[i].value).style.visibility = 'hidden';
+ document.getElementById(E.elements[i].value).style.display = 'none';
}
}
}
@@ -879,7 +879,7 @@ function General_scroll()
{
/*
if (!document.getElementById('show_relation_olways').checked) {
- document.getElementById("canvas").style.visibility = 'hidden';
+ document.getElementById("canvas").style.display = 'none';
clearTimeout(timeoutID);
timeoutID = setTimeout(General_scroll_end, 500);
}
@@ -908,7 +908,7 @@ function General_scroll_end()
document.getElementById('layer_menu').style.left = document.body.scrollLeft;
document.getElementById('layer_menu').style.top = document.body.scrollTop + document.getElementById('top_menu').offsetHeight;
}
- document.getElementById("canvas").style.visibility = 'visible';
+ document.getElementById("canvas").style.display = 'block';
}
*/
@@ -916,7 +916,7 @@ function Show_left_menu(id_this) // max/min all tables
{
if (id_this.alt == "v") {
document.getElementById("layer_menu").style.top = document.getElementById('top_menu').offsetHeight + 'px';
- document.getElementById("layer_menu").style.visibility = 'visible';
+ document.getElementById("layer_menu").style.display = 'block';
id_this.alt = ">";
id_this.src = "pmd/images/uparrow2_m.png";
if (isIE) {
@@ -924,7 +924,7 @@ function Show_left_menu(id_this) // max/min all tables
}
} else {
document.getElementById("layer_menu").style.top = -1000 + 'px'; //fast scroll
- document.getElementById("layer_menu").style.visibility = 'hidden';
+ document.getElementById("layer_menu").style.display = 'none';
id_this.alt = "v";
id_this.src = "pmd/images/downarrow2_m.png";
}
diff --git a/pmd_general.php b/pmd_general.php
index 89a6d5c..cf8d842 100644
--- a/pmd_general.php
+++ b/pmd_general.php
@@ -17,7 +17,6 @@ $script_contr = get_script_contr();
$tab_pos = get_tab_pos();
$tables_pk_or_unique_keys = get_pk_or_unique_keys();
$tables_all_keys = get_all_keys();
-$hidden = "hidden";
$params = array('lang' => $GLOBALS['lang']);
if (isset($GLOBALS['db'])) {
@@ -120,7 +119,7 @@ echo $script_tabs . $script_contr . $script_display_field;
<div id="osn_tab">
<canvas class="pmd" id="canvas" width="100" height="100" onclick="Canvas_click(this)"></canvas>
</div>
-<div id="layer_menu" style="visibility:<?php echo $hidden ?>;">
+<div id="layer_menu" style="display:none;">
<div align="center" style="padding-top:5px;">
<a href="javascript:Hide_tab_all(document.getElementById('key_HS_all'));"
onmousedown="return false;" class="M_butt" target="_self">
@@ -328,9 +327,9 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
?>
</form>
<div id="pmd_hint"></div>
-<div id='layer_action' style="visibility:<?php echo $hidden ?>;">Load...</div>
+<div id='layer_action' style="display:none;">Load...</div>
-<table id="layer_new_relation" style="visibility:<?php echo $hidden ?>;"
+<table id="layer_new_relation" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -381,7 +380,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
value="<?php echo __('OK'); ?>" onclick="New_relation()" />
<input type="button" class="butt" name="Button"
value="<?php echo __('Cancel'); ?>"
- onclick="document.getElementById('layer_new_relation').style.visibility = 'hidden';" />
+ onclick="document.getElementById('layer_new_relation').style.display = 'none';" />
</td>
</tr>
</tbody>
@@ -397,7 +396,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
</table>
-<table id="layer_upd_relation" style="visibility:<?PHP echo $hidden ?>;"
+<table id="layer_upd_relation" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -418,7 +417,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
onclick="Upd_relation()" value="<?php echo __('Delete'); ?>" />
<input type="button" class="butt" name="Button"
value="<?php echo __('Cancel'); ?>"
- onclick="document.getElementById('layer_upd_relation').style.visibility = 'hidden'; Re_load();" />
+ onclick="document.getElementById('layer_upd_relation').style.display = 'none'; Re_load();" />
</td>
</tr>
</table></td>
@@ -432,7 +431,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
</table>
-<table id="pmd_optionse" style="visibility:<?php echo $hidden ?>;"
+<table id="pmd_optionse" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -554,7 +553,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
</table>
-<table id="query_rename_to" style="visibility:<?php echo $hidden ?>;"
+<table id="query_rename_to" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -586,7 +585,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
value="<?php echo __('OK'); ?>" onclick="edit('Rename')" />
<input type="button" class="butt" name="Button"
value="<?php echo __('Cancel'); ?>"
- onclick="document.getElementById('query_rename_to').style.visibility = 'hidden';" />
+ onclick="document.getElementById('query_rename_to').style.display = 'none';" />
</td>
</tr>
</tbody>
@@ -602,7 +601,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
</table>
-<table id="query_having" style="visibility:<?php echo $hidden ?>;"
+<table id="query_having" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -662,7 +661,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
value="<?php echo __('OK'); ?>" onclick="edit('Having')" />
<input type="button" class="butt" name="Button"
value="<?php echo __('Cancel'); ?>"
- onclick="document.getElementById('query_having').style.visibility = 'hidden';" />
+ onclick="document.getElementById('query_having').style.display = 'none';" />
</td>
</tr>
</tbody>
@@ -678,7 +677,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
</table>
-<table id="query_Aggregate" style="visibility:<?php echo $hidden ?>;"
+<table id="query_Aggregate" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -716,7 +715,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
value="<?php echo __('OK'); ?>" onclick="edit('Aggregate')" />
<input type="button" class="butt" name="Button"
value="<?php echo __('Cancel'); ?>"
- onclick="document.getElementById('query_Aggregate').style.visibility = 'hidden';" />
+ onclick="document.getElementById('query_Aggregate').style.display = 'none';" />
</td>
</tr>
</tbody>
@@ -732,7 +731,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
</tbody>
</table>
-<table id="query_where" style="visibility:<?php echo $hidden ?>;"
+<table id="query_where" style="display:none;"
width="5%" border="0" cellpadding="0" cellspacing="0">
<tbody>
<tr>
@@ -779,7 +778,7 @@ for ($i = 0; $i < count($GLOBALS['PMD']["TABLE_NAME"]); $i++) {
value="<?php echo __('OK'); ?>" onclick="edit('Where')" />
<input type="button" class="butt" name="Button"
value="<?php echo __('Cancel'); ?>"
- onclick="document.getElementById('query_where').style.visibility = 'hidden';" />
+ onclick="document.getElementById('query_where').style.display = 'none';" />
</td>
</tr>
</tbody>
hooks/post-receive
--
phpMyAdmin
More information about the Git
mailing list