doxygen/doxygen-771310.patch
Than Ngo 51a1d8e570 backport upstream fixes:
Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error
   Bug 771344 - Class name 'internal' breaks class hierarchy in C++
2016-10-20 11:57:02 +02:00

44 lines
2.0 KiB
Diff

commit b5e1e195bc207c7bb93df4e51253f9f3a1026a3d
Author: Dimitri van Heesch <dimitri@stack.nl>
Date: Wed Sep 21 20:24:15 2016 +0200
Bug 771310 - French description for "Namespace Members" is wrong and causes fatal javascript error
diff --git a/src/index.cpp b/src/index.cpp
index 96909c7..41e3318 100644
--- a/src/index.cpp
+++ b/src/index.cpp
@@ -4327,8 +4327,8 @@ void renderMemberIndicesAsJs(FTextStream &t,
t << "children:[";
firstMember=FALSE;
}
- t << endl << "{text:'" << convertToJSString(getInfo(i)->title) << "',url:'"
- << convertToJSString(getInfo(i)->fname+Doxygen::htmlFileExtension) << "'";
+ t << endl << "{text:\"" << convertToJSString(getInfo(i)->title) << "\",url:\""
+ << convertToJSString(getInfo(i)->fname+Doxygen::htmlFileExtension) << "\"";
// Check if we have many members, then add sub entries per letter...
// quick alphabetical index
@@ -4357,8 +4357,8 @@ void renderMemberIndicesAsJs(FTextStream &t,
anchor=fullName+extension+"#index_";
else // other pages of multi page index
anchor=fullName+"_"+is+extension+"#index_";
- t << "{text:'" << convertToJSString(ci) << "',url:'"
- << convertToJSString(anchor+is) << "'}";
+ t << "{text:\"" << convertToJSString(ci) << "\",url:\""
+ << convertToJSString(anchor+is) << "\"}";
firstLetter=FALSE;
}
t << "]";
@@ -4393,8 +4393,8 @@ static bool renderQuickLinksAsJs(FTextStream &t,LayoutNavEntry *root,bool first)
if (!firstChild) t << "," << endl;
firstChild=FALSE;
QCString url = entry->url();
- t << "{text:'" << convertToJSString(entry->title()) << "',url:'"
- << convertToJSString(url) << "'";
+ t << "{text:\"" << convertToJSString(entry->title()) << "\",url:\""
+ << convertToJSString(url) << "\"";
bool hasChildren=FALSE;
if (entry->kind()==LayoutNavEntry::NamespaceMembers)
{