Patch #3050492, Cannot drag table box to the edge

This commit is contained in:
Martin Schönberger
2010-08-28 08:16:05 -04:00
committed by Marc Delisle
parent 8ec1c4a164
commit fee00e61aa
3 changed files with 10 additions and 1 deletions

View File

@@ -6,6 +6,8 @@ $Id$
$HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $
3.3.7.0 (not yet released) 3.3.7.0 (not yet released)
- patch #3050492 [PDF scratchboard] Cannot drag table box to the edge after
a page size increase, thanks to Martin Schönberger - mad05
3.3.6.0 (not yet released) 3.3.6.0 (not yet released)
- bug #3033063 [core] Navi gets wrong db name - bug #3033063 [core] Navi gets wrong db name

View File

@@ -1385,6 +1385,7 @@ function refreshDragOption(e) {
myid = getElement(e); myid = getElement(e);
if (myid.style.visibility == 'visible') { if (myid.style.visibility == 'visible') {
refreshLayout(); refreshLayout();
TableDragInit();
} }
} }

View File

@@ -349,7 +349,7 @@ foreach ($array_sh_page AS $key => $temp_sh_page) {
$drag_x = $temp_sh_page['x']; $drag_x = $temp_sh_page['x'];
$drag_y = $temp_sh_page['y']; $drag_y = $temp_sh_page['y'];
$draginit .= ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n"; $draginit2 = ' Drag.init(getElement("table_' . $i . '"), null, 0, parseInt(myid.style.width)-2, 0, parseInt(myid.style.height)-5);' . "\n";
$draginit .= ' getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n"; $draginit .= ' getElement("table_' . $i . '").onDrag = function (x, y) { document.edcoord.elements["c_table_' . $i . '[x]"].value = parseInt(x); document.edcoord.elements["c_table_' . $i . '[y]"].value = parseInt(y) }' . "\n";
$draginit .= ' getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n"; $draginit .= ' getElement("table_' . $i . '").style.left = "' . $drag_x . 'px";' . "\n";
$draginit .= ' getElement("table_' . $i . '").style.top = "' . $drag_y . 'px";' . "\n"; $draginit .= ' getElement("table_' . $i . '").style.top = "' . $drag_y . 'px";' . "\n";
@@ -385,6 +385,12 @@ function init() {
refreshLayout(); refreshLayout();
myid = getElement('pdflayout'); myid = getElement('pdflayout');
<?php echo $draginit; ?> <?php echo $draginit; ?>
TableDragInit();
}
function TableDragInit() {
myid = getElement('pdflayout');
<?php echo $draginit2; ?>
} }
function resetDrag() { function resetDrag() {