generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-25 10:09:36 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.11.2' into poco-1.12.0

Browse Source
This commit is contained in:
Alex Fabijanic
2022-04-19 09:08:43 +00:00
parent a1819107de 96c0bf6d78
commit 1aee1c25b7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
PocoDoc/resources/index.thtml
View File

@@ -16,7 +16,7 @@ ${PocoDoc.customHeadHTML}
</div> </div>
<div class="body"> <div class="body">
<div id="navigation"> <div id="navigation">
<iframe sandbox src="navigation.html" onload="iFrameResize(this);" scrolling="no"></iframe> <iframe sandbox="allow-scripts allow-top-navigation-by-user-activation allow-same-origin" src="navigation.html" onload="iFrameResize(this);" scrolling="no"></iframe>
</div> </div>
<div id="content"> <div id="content">
<h2>User Guides And Tutorials</h2> <h2>User Guides And Tutorials</h2>

2
PocoDoc/src/DocWriter.cpp
View File

@@ -808,7 +808,7 @@ void DocWriter::writeNavigationFrame(std::ostream& ostr, const std::string& grou
query += item; query += item;
} }
ostr << "<div id=\"navigation\">\n"; ostr << "<div id=\"navigation\">\n";
ostr << "<iframe sandbox src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n"; ostr << "<iframe sandbox=\"allow-scripts allow-top-navigation-by-user-activation allow-same-origin\" src=\"navigation.html" << query << "\" onload=\"iFrameResize(this);\" scrolling=\"no\"></iframe>\n";
ostr << "</div>\n"; ostr << "</div>\n";
} }