crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Same source issue solved. fullscreenToggle now checks if it is permitted to inspect other iframes.

This commit is contained in:
Ján Jockusch 2019-05-08 07:21:19 +02:00
parent 69f2901e66
commit bdba39afd2
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/ui.js
View File

@ -1198,13 +1198,17 @@ const UI = {
let doc_el = document.documentElement; let doc_el = document.documentElement;
if (window.self !== window.top) { if (window.self !== window.top) {
// Seek out the correct iframe from the parent document. // Seek out the correct iframe from the parent document.
// This will produce errors if the iframe does not come from
// the same origin, so it is advisable to put the viewer in
// iframes only if you are on the same server.
let iframes = window.parent.document let iframes = window.parent.document
.getElementsByTagName('iframe'); .getElementsByTagName('iframe');
for (let i in iframes) { for (let i in iframes) {
if (iframes[i].contentDocument === document) { let content_doc = null;
try {
content_doc = iframes[i].contentDocument;
} catch (err) {
// I may not be permitted to read the contentDocument
// of the iframe, but then it can't be me, so ignore.
}
if (content_doc === document) {
doc_el = iframes[i]; doc_el = iframes[i];
// To use .body.msRequestFullscreen in IE, we need to // To use .body.msRequestFullscreen in IE, we need to
// set the document element accordingly. // set the document element accordingly.