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

Fixed bugs in convert foot notes to tooltips logic

Browse Source
This commit is contained in:
Thilanka Kaushalya 2011-07-21 10:01:21 +05:30
parent 7c3dfb454c
commit d00cf18325
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/functions.js
View File

@ -2275,8 +2275,14 @@ function checkIndexName(form_id)
return true;
} // end of the 'checkIndexName()' function
/* Displays tooltips */
/**
* function to convert the footnotes to tooltips
*
* @param jquery-Object $div a div jquery object which crries the domain
* for searching footnootes. If we ommit this
* parameter the function searches the footnotes
* in the whole body
**/
function PMA_convertFootnotesToTooltips($div) {
// Hide the footnotes from the footer (which are displayed for
// JavaScript-disabled browsers) since the tooltip is sufficient
@ -2300,8 +2306,21 @@ function PMA_convertFootnotesToTooltips($div) {
$div.find("img.footnotemarker").show();
$div.find("img.footnotemarker").each(function() {
var span_id = $(this).attr("class");
span_id = span_id.split("_")[1];
var img_class = $(this).attr("class");
/** img contains two classes, as example "footnotemarker footnote_1_1".
* We spit it by second classs and take it for the id of span
*/
img_class = img_class.split(" ");
for (i = 0; i < img_class.length; i++) {
if (img_class[i].split("_")[0] == "footnote") {
var span_id = img_class[i].split("_")[1];
}
}
/**
* Now we get the #id of the span with span_id variable. As an example if we
* initially get the img class as "footnotemarker footnote_2_3", now we get
* #2 as the span_id. Using that we can find footnote_2 in footnotes.
* */
var tooltip_text = $footnotes.find("span[id='footnote_" + span_id + "']").html();
$(this).qtip({
content: tooltip_text,

7
libraries/common.lib.php
View File

@ -459,18 +459,13 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
$GLOBALS['footnotes'] = array();
}
$nr = count($GLOBALS['footnotes']) + 1;
// this is the first instance of this message
$instance = 1;
$GLOBALS['footnotes'][$key] = array(
'note' => $message,
'type' => $type,
'nr' => $nr,
'instance' => $instance
);
} else {
$nr = $GLOBALS['footnotes'][$key]['nr'];
// another instance of this message (to ensure ids are unique)
$instance = ++$GLOBALS['footnotes'][$key]['instance'];
}
if ($bbcode) {
@ -479,7 +474,7 @@ function PMA_showHint($message, $bbcode = false, $type = 'notice')
// footnotemarker used in js/tooltip.js
return '<sup class="footnotemarker">' . $nr . '</sup>' .
'<img class="footnotemarker footnote_' . $nr . '_' . $instance . '" src="' .
'<img class="footnotemarker footnote_' . $nr . '" src="' .
$GLOBALS['pmaThemeImage'] . 'b_help.png" alt="" />';
}