Skip to content

Commit a1fd982

Browse files
doxygendoxygen
committed
issue #6901: Please consider relicensing of Javascript files
- Corrected license for inline javascript snippets
1 parent bb77caf commit a1fd982

File tree

4 files changed

+16
-16
lines changed

4 files changed

+16
-16
lines changed

‎src/htmlgen.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -408,7 +408,7 @@ static QCString substituteHtmlKeywords(const QCString &str,
408408
if (disableIndex || !Config_getBool(HTML_DYNAMIC_MENUS))
409409
{
410410
searchCssJs += "<script type=\"text/javascript\">\n"
411-
"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n"
411+
"/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n"
412412
" $(document).ready(function() { init_search(); });\n"
413413
"/* @license-end */\n"
414414
"</script>";
@@ -419,7 +419,7 @@ static QCString substituteHtmlKeywords(const QCString &str,
419419
if (disableIndex || !Config_getBool(HTML_DYNAMIC_MENUS))
420420
{
421421
searchCssJs += "<script type=\"text/javascript\">\n"
422-
"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n"
422+
"/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n"
423423
" $(document).ready(function() {\n"
424424
" if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }\n"
425425
" });\n"
@@ -1130,7 +1130,7 @@ void HtmlGenerator::startFile(const QCString &name,const QCString &,
11301130
if (searchEngine /*&& !generateTreeView*/)
11311131
{
11321132
m_t << "<script type=\"text/javascript\">\n";
1133-
m_t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
1133+
m_t << "/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n";
11341134
m_t << "var searchBox = new SearchBox(\"searchBox\", \""
11351135
<< m_relPath<< "search\",'" << theTranslator->trSearch() << "','" << Doxygen::htmlFileExtension << "');\n";
11361136
m_t << "/* @license-end */\n";
@@ -2488,7 +2488,7 @@ static void writeDefaultQuickLinks(TextStream &t,bool compact,
24882488
t << "<script type=\"text/javascript\" src=\"" << relPath << "menudata.js\"></script>\n";
24892489
t << "<script type=\"text/javascript\" src=\"" << relPath << "menu.js\"></script>\n";
24902490
t << "<script type=\"text/javascript\">\n";
2491-
t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
2491+
t << "/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n";
24922492
t << "$(function() {\n";
24932493
t << " initMenu('" << relPath << "',"
24942494
<< (searchEngine?"true":"false") << ","
@@ -2571,7 +2571,7 @@ QCString HtmlGenerator::writeSplitBarAsString(const QCString &name,const QCStrin
25712571
" </div>\n"
25722572
"</div>\n"
25732573
"<script type=\"text/javascript\">\n"
2574-
"/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n"
2574+
"/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n"
25752575
"$(document).ready(function(){initNavTree('") +
25762576
QCString(addHtmlExtensionIfMissing(name)) +
25772577
QCString("','") + relpath +
@@ -2668,7 +2668,7 @@ void HtmlGenerator::writeSearchPage()
26682668
t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen "
26692669
<< getDoxygenVersion() << " -->\n";
26702670
t << "<script type=\"text/javascript\">\n";
2671-
t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
2671+
t << "/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n";
26722672
t << "var searchBox = new SearchBox(\"searchBox\", \""
26732673
<< "search\",'" << theTranslator->trSearch() << "','" << Doxygen::htmlFileExtension << "');\n";
26742674
t << "/* @license-end */\n";
@@ -2724,7 +2724,7 @@ void HtmlGenerator::writeExternalSearchPage()
27242724
t << "<!-- " << theTranslator->trGeneratedBy() << " Doxygen "
27252725
<< getDoxygenVersion() << " -->\n";
27262726
t << "<script type=\"text/javascript\">\n";
2727-
t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
2727+
t << "/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n";
27282728
t << "var searchBox = new SearchBox(\"searchBox\", \""
27292729
<< "search\",'" << theTranslator->trSearch() << "','" << Doxygen::htmlFileExtension << "');\n";
27302730
t << "/* @license-end */\n";

‎src/searchindex.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -939,7 +939,7 @@ void writeJavaScriptSearchIndex()
939939
t << "<div class=\"SRStatus\" id=\"Loading\">" << theTranslator->trLoading() << "</div>\n";
940940
t << "<div id=\"SRResults\"></div>\n"; // here the results will be inserted
941941
t << "<script type=\"text/javascript\">\n";
942-
t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
942+
t << "/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n";
943943
t << "createResults();\n"; // this function will insert the results
944944
t << "/* @license-end */\n";
945945
t << "</script>\n";
@@ -949,7 +949,7 @@ void writeJavaScriptSearchIndex()
949949
<< theTranslator->trNoMatches() << "</div>\n";
950950

951951
t << "<script type=\"text/javascript\">\n";
952-
t << "/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */\n";
952+
t << "/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */\n";
953953
t << "document.getElementById(\"Loading\").style.display=\"none\";\n";
954954
t << "document.getElementById(\"NoMatches\").style.display=\"none\";\n";
955955
t << "var searchResults = new SearchResults(\"searchResults\");\n";

‎templates/html/htmlbase.tpl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<script type="text/javascript" src="{{ page.relPath }}search/search.js"></script>
2828
{% if config.SERVER_BASED_SEARCH %}
2929
<script type="text/javascript">
30-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
30+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */
3131
$(document).ready(function() {
3232
if ($('.searchresults').length > 0) { searchBox.DOMSearchField().focus(); }
3333
});
@@ -36,7 +36,7 @@
3636
<link rel="search" href="{{ page.relPath }}search-opensearch.php?v=opensearch.xml" type="application/opensearchdescription+xml" title="{{ config.PROJECT_NAME }}"/>
3737
{% elif config.DISABLE_INDEX or not config.HTML_DYNAMIC_MENUS %}
3838
<script type="text/javascript">
39-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
39+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */
4040
$(document).ready(function() { init_search(); });
4141
/* @license-end */
4242
</script>
@@ -155,7 +155,7 @@ MathJax.Hub.Config({
155155
{% block search %}
156156
{% if config.SEARCHENGINE %}
157157
<script type="text/javascript">
158-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
158+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */
159159
var searchBox = new SearchBox("searchBox", "{{ page.relPath }}search",false,'{{ tr.search }}','{{ config.HTML_FILE_EXTENSION }}');
160160
/* @license-end */
161161
</script>
@@ -167,7 +167,7 @@ MathJax.Hub.Config({
167167
<script type="text/javascript" src="menudata.js"></script>
168168
<script type="text/javascript" src="menu.js"></script>
169169
<script type="text/javascript">
170-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
170+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */
171171
$(function() {
172172
initMenu('{{ page.relPath }}',{% if config.SEARCHENGINE %}true{% else %}false{% endif %},{% if config.SERVER_BASED_SEARCH %}true{% else %}false{% endif %},{% if config.EXTERNAL_SEARCH %}'search{{ config.HTML_FILE_EXTENSION }}'{% else %}'search.php'{% endif %},'{{ tr.search }}');
173173
{% if config.SEARCHENGINE %}
@@ -201,7 +201,7 @@ $(function() {
201201
</div>
202202
</div>
203203
<script type="text/javascript">
204-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
204+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */
205205
$(document).ready(function(){initNavTree('{{ page.fileName }}{% if page_postfix %}{{ page_postfix }}{% endif %}{{ config.HTML_FILE_EXTENSION }}','{{ page.relPath }}'); initResizable(); });
206206
/* @license-end */
207207
</script>

‎templates/html/htmlsearchresult.tpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@
1313
<div class="SRStatus" id="Loading">{{ tr.loading }}</div>
1414
<div id="SRResults"></div>
1515
<script type="text/javascript">
16-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
16+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */
1717
createResults();
1818
/* @license-end */
1919
</script>
2020
<div class="SRStatus" id="Searching">{{ tr.searching }}</div>
2121
<div class="SRStatus" id="NoMatches">{{ tr.noMatches }}</div>
2222
<script type="text/javascript">
23-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
23+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt MIT */
2424
document.getElementById("Loading").style.display="none";
2525
document.getElementById("NoMatches").style.display="none";
2626
var searchResults = new SearchResults("searchResults");

0 commit comments

Comments
 (0)