[Phpmyadmin-git] [SCM] phpMyAdmin branch, QA_3_3, updated. RELEASE_3_3_6RC1-10-gfee00e6

The branch, QA_3_3 has been updated via fee00e61aa505a83b097021e3f8e3c6f4dd37b67 (commit) from 8ec1c4a1647546477ebff2745c62fcf2627b89a9 (commit) - Log ----------------------------------------------------------------- commit fee00e61aa505a83b097021e3f8e3c6f4dd37b67 Author: Martin Schönberger <mad05@users.sourceforge.net> Date: Sat Aug 28 08:16:05 2010 -0400 Patch #3050492, Cannot drag table box to the edge ----------------------------------------------------------------------- Summary of changes: ChangeLog | 2 ++ js/functions.js | 1 + pdf_pages.php | 8 +++++++- 3 files changed, 10 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index a21d0fd..268298d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/C... $ 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) - bug #3033063 [core] Navi gets wrong db name diff --git a/js/functions.js b/js/functions.js index 93cee60..697c344 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1385,6 +1385,7 @@ function refreshDragOption(e) { myid = getElement(e); if (myid.style.visibility == 'visible') { refreshLayout(); + TableDragInit(); } } diff --git a/pdf_pages.php b/pdf_pages.php index aff7385..7b0d6a8 100644 --- a/pdf_pages.php +++ b/pdf_pages.php @@ -349,7 +349,7 @@ foreach ($array_sh_page AS $key => $temp_sh_page) { $drag_x = $temp_sh_page['x']; $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 . '").style.left = "' . $drag_x . 'px";' . "\n"; $draginit .= ' getElement("table_' . $i . '").style.top = "' . $drag_y . 'px";' . "\n"; @@ -385,6 +385,12 @@ function init() { refreshLayout(); myid = getElement('pdflayout'); <?php echo $draginit; ?> + TableDragInit(); +} + +function TableDragInit() { + myid = getElement('pdflayout'); + <?php echo $draginit2; ?> } function resetDrag() { hooks/post-receive -- phpMyAdmin
participants (1)
-
Marc Delisle