Merge branch 'poco-1.11.2' into poco-1.12.0

This commit is contained in:
Alex Fabijanic 2022-04-19 09:08:43 +00:00
commit 1aee1c25b7
2 changed files with 2 additions and 2 deletions

View File

@ -16,7 +16,7 @@ ${PocoDoc.customHeadHTML}
</div>
<div class="body">
<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 id="content">
<h2>User Guides And Tutorials</h2>

View File

@ -808,7 +808,7 @@ void DocWriter::writeNavigationFrame(std::ostream& ostr, const std::string& grou
query += item;
}
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";
}