summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <doxygen@gmail.com>2019-01-12 12:58:10 (GMT)
committerGitHub <noreply@github.com>2019-01-12 12:58:10 (GMT)
commit14ef3d638c017256a8315ce9f20d576740dc1b98 (patch)
tree019c1eeccad0707254030f2ef726e9fe0effce34
parent741336bac33523f724fe62b3736349ee2a06877f (diff)
parenta2e30e57062cb6e826bbb87dec3db433fcc20260 (diff)
downloadDoxygen-14ef3d638c017256a8315ce9f20d576740dc1b98.zip
Doxygen-14ef3d638c017256a8315ce9f20d576740dc1b98.tar.gz
Doxygen-14ef3d638c017256a8315ce9f20d576740dc1b98.tar.bz2
Merge pull request #6767 from albert-github/feature/bug_xhtml_tooltip
Invalid id possible with tooltips
-rw-r--r--src/htmlgen.cpp2
-rw-r--r--src/tooltip.cpp1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp
index efd2108..b8fc5a2 100644
--- a/src/htmlgen.cpp
+++ b/src/htmlgen.cpp
@@ -769,7 +769,7 @@ void HtmlGenerator::init()
t << endl <<
"$(document).ready(function() {\n"
" $('.code,.codeRef').each(function() {\n"
- " $(this).data('powertip',$('#'+$(this).attr('href').replace(/.*\\//,'').replace(/[^a-z_A-Z0-9]/g,'_')).html());\n"
+ " $(this).data('powertip',$('#a'+$(this).attr('href').replace(/.*\\//,'').replace(/[^a-z_A-Z0-9]/g,'_')).html());\n"
" $(this).powerTip({ placement: 's', smartPlacement: true, mouseOnToPopup: true });\n"
" });\n"
"});\n";
diff --git a/src/tooltip.cpp b/src/tooltip.cpp
index 3b128a9..91da583 100644
--- a/src/tooltip.cpp
+++ b/src/tooltip.cpp
@@ -84,6 +84,7 @@ void TooltipManager::addTooltip(Definition *d)
{
id+="_"+anc;
}
+ id = "a" + id;
if (p->tooltipInfo.find(id)==0)
{
p->tooltipInfo.insert(id,d);