nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make footnote tooltips work again; ensure ids are unique

Browse Source
This commit is contained in:
Marc Delisle
2008-06-25 17:01:31 +00:00
parent 7c166c00fb
commit 134b41faf6
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/tooltip.js
View File

@@ -158,7 +158,7 @@ function moveTooltip(posX, posY)
*/ */
function pmaTooltip(e) function pmaTooltip(e)
{ {
var theText = document.getElementById(this.getAttribute('name')).innerHTML; var theText = document.getElementById('footnote_' + this.innerHTML).innerHTML;
var plusX = 0, plusY = 0, docX = 0, docY = 0; var plusX = 0, plusY = 0, docX = 0, docY = 0;
var divHeight = myTooltipContainer.clientHeight; var divHeight = myTooltipContainer.clientHeight;

7
libraries/common.lib.php
View File

@@ -440,13 +440,18 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
if (! isset($GLOBALS['footnotes'][$key])) { if (! isset($GLOBALS['footnotes'][$key])) {
$nr = count($GLOBALS['footnotes']) + 1; $nr = count($GLOBALS['footnotes']) + 1;
// this is the first instance of this message
$instance = 1;
$GLOBALS['footnotes'][$key] = array( $GLOBALS['footnotes'][$key] = array(
'note' => $message, 'note' => $message,
'type' => $type, 'type' => $type,
'nr' => $nr, 'nr' => $nr,
'instance' => $instance
); );
} else { } else {
$nr = $GLOBALS['footnotes'][$key]['nr']; $nr = $GLOBALS['footnotes'][$key]['nr'];
// another instance of this message (to ensure ids are unique)
$instance = ++$GLOBALS['footnotes'][$key]['instance'];
} }
if ($bbcode) { if ($bbcode) {
@@ -454,7 +459,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
} }
// footnotemarker used in js/tooltip.js // footnotemarker used in js/tooltip.js
return '<sup class="footnotemarker" id="footnote_sup_' . $nr . '">' . $nr . '</sup>'; return '<sup class="footnotemarker" id="footnote_sup_' . $nr . '_' . $instance . '">' . $nr . '</sup>';
} }
/** /**