diff options
author | Dimitri van Heesch <dimitri@stack.nl> | 2017-09-02 14:36:18 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-02 14:36:18 (GMT) |
commit | cd3a7759dbb7f2adbfa664901cf7b291a9739b01 (patch) | |
tree | 64fe20f104677ea2bd273d82f4c64c0e0b0f31c2 /src | |
parent | c7c61367d22d07db13b28d2126547088064f9c11 (diff) | |
parent | c69e435b3fa7d87b9e2c5defd2cc9fe98d6d6cd8 (diff) | |
download | Doxygen-cd3a7759dbb7f2adbfa664901cf7b291a9739b01.zip Doxygen-cd3a7759dbb7f2adbfa664901cf7b291a9739b01.tar.gz Doxygen-cd3a7759dbb7f2adbfa664901cf7b291a9739b01.tar.bz2 |
Merge pull request #594 from albert-github/feature/regression_586
Marks JS as freely licensed (regression pull request 586)
Diffstat (limited to 'src')
-rw-r--r-- | src/htmlgen.cpp | 18 | ||||
-rw-r--r-- | src/searchindex.cpp | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/htmlgen.cpp b/src/htmlgen.cpp index 0cb7ab9..224c9b9 100644 --- a/src/htmlgen.cpp +++ b/src/htmlgen.cpp @@ -295,7 +295,7 @@ static QCString substituteHtmlKeywords(const QCString &s, "<script type=\"text/javascript\" src=\"$relpath^navtreedata.js\"></script>\n" "<script type=\"text/javascript\" src=\"$relpath^navtree.js\"></script>\n" "<script type=\"text/javascript\">\n" - "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n" + "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n" " $(document).ready(initResizable);\n" "/* @license-end */" "</script>"; @@ -315,7 +315,7 @@ static QCString substituteHtmlKeywords(const QCString &s, if (disableIndex || !Config_getBool(HTML_DYNAMIC_MENUS)) { searchCssJs += "<script type=\"text/javascript\">\n" - "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; " $(document).ready(function() { init_search(); });\n" "/* @license-end */\n" "</script>"; @@ -326,7 +326,7 @@ static QCString substituteHtmlKeywords(const QCString &s, if (disableIndex || !Config_getBool(HTML_DYNAMIC_MENUS)) { searchCssJs += "<script type=\"text/javascript\">\n" - "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n" + "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n" " $(document).ready(function() {\n" " if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }\n" " });\n" @@ -900,7 +900,7 @@ void HtmlGenerator::startFile(const char *name,const char *, if (searchEngine /*&& !generateTreeView*/) { t << "<script type=\"text/javascript\">\n"; - t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "var searchBox = new SearchBox(\"searchBox\", \"" << relPath<< "search\",false,'" << theTranslator->trSearch() << "');\n"; t << "/* @license-end */\n"; @@ -2211,7 +2211,7 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact, t << "<script type=\"text/javascript\" src=\"" << relPath << "menudata.js\"></script>" << endl; t << "<script type=\"text/javascript\" src=\"" << relPath << "menu.js\"></script>" << endl; t << "<script type=\"text/javascript\">" << endl; - t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "$(function() {" << endl; t << " initMenu('" << relPath << "'," << (searchEngine?"true":"false") << "," @@ -2226,7 +2226,7 @@ static void writeDefaultQuickLinks(FTextStream &t,bool compact, } else { - t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << " $(document).ready(function() {\n" << " if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }\n" << " });\n"; @@ -2291,7 +2291,7 @@ QCString HtmlGenerator::writeSplitBarAsString(const char *name,const char *relpa " </div>\n" "</div>\n" "<script type=\"text/javascript\">\n" - "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n" + "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n" "$(document).ready(function(){initNavTree('") + QCString(name) + Doxygen::htmlFileExtension + QCString("','") + relpath + @@ -2377,7 +2377,7 @@ void HtmlGenerator::writeSearchPage() t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " << versionString << " -->" << endl; t << "<script type=\"text/javascript\">\n"; - t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "var searchBox = new SearchBox(\"searchBox\", \"" << "search\",false,'" << theTranslator->trSearch() << "');\n"; t << "/* @license-end */\n"; @@ -2431,7 +2431,7 @@ void HtmlGenerator::writeExternalSearchPage() t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen " << versionString << " -->" << endl; t << "<script type=\"text/javascript\">\n"; - t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "var searchBox = new SearchBox(\"searchBox\", \"" << "search\",false,'" << theTranslator->trSearch() << "');\n"; t << "/* @license-end */\n"; diff --git a/src/searchindex.cpp b/src/searchindex.cpp index dadfd6f..6fb2432 100644 --- a/src/searchindex.cpp +++ b/src/searchindex.cpp @@ -940,7 +940,7 @@ void writeJavascriptSearchIndex() t << "<div class=\"SRStatus\" id=\"Loading\">" << theTranslator->trLoading() << "</div>" << endl; t << "<div id=\"SRResults\"></div>" << endl; // here the results will be inserted t << "<script type=\"text/javascript\"><!--" << endl; - t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "createResults();" << endl; // this function will insert the results t << "/* @license-end */\n"; t << "--></script>" << endl; @@ -950,7 +950,7 @@ void writeJavascriptSearchIndex() << theTranslator->trNoMatches() << "</div>" << endl; t << "<script type=\"text/javascript\"><!--" << endl; - t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; + t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&dn=gpl-2.0.txt GPL-v2 */\n"; t << "document.getElementById(\"Loading\").style.display=\"none\";" << endl; t << "document.getElementById(\"NoMatches\").style.display=\"none\";" << endl; t << "var searchResults = new SearchResults(\"searchResults\");" << endl; |