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