mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-12 18:20:26 +01:00
Merge branch 'poco-1.11.2' into poco-1.12.0
This commit is contained in:
commit
1aee1c25b7
@ -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>
|
||||
|
@ -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";
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user