Freifunk-Leipzig
/
meshviewer
Archived
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix irame message handling

This commit is contained in:
Michael Wyraz 2021-12-02 21:07:25 +01:00
parent e9917737de
commit 1c93d924de
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html/embed.html
View File

@ -1,6 +1,6 @@
<html> <html>
<iframe src="./index.html" style="border: 1px solid red; width: 95%; height: 95%" id="meshviewer-embedded"></iframe> <iframe src="./index.html" style="border: 1px solid red; width: 95%; height: 95%" id="meshviewer-embedded"></iframe>
<script type="text/javascript" src="./embed.js" /> <script type="text/javascript" src="./embed.js"></script>
</html> </html>

21
html/embed.js
View File

@ -11,22 +11,17 @@
} }
function updateIframeHash() { // see https://gist.github.com/manufitoussi/7529fa882ff0b737f257 function updateIframeHash() { // see https://gist.github.com/manufitoussi/7529fa882ff0b737f257
if(iframe.contentWindow.location.host !== "") { // iframe is just starting.
// iframe already loaded. var newHash = window.location.hash;
iframe.contentWindow.location.hash = window.location.hash; var srcStr = iframe.getAttribute('src');
} else { var words = srcStr.split('#');
// iframe is just starting. var href = words[0];
var newHash = window.location.hash; var newSrc = href + newHash;
var srcStr = iframe.getAttribute('src'); iframe.setAttribute('src', newSrc);
var words = srcStr.split('#');
var href = words[0];
var newSrc = href + newHash;
iframe.setAttribute('src', newSrc);
}
}; };
updateIframeHash(); updateIframeHash();
iframe.contentWindow.addEventListener("message", (event) => { window.addEventListener("message", (event) => {
if (event && event.data && event.data.hash) { if (event && event.data && event.data.hash) {
window.location.replace(event.data.hash); window.location.replace(event.data.hash);
} }

2
lib/main.js
View File

@ -72,7 +72,7 @@ define(['moment', 'utils/router', 'leaflet', 'gui', 'helper', 'utils/language'],
} }
window.onhashchange = function () { window.onhashchange = function () {
window.postMessage({hash: window.location.hash}, '*'); parent.postMessage({hash: window.location.hash}, '*');
}; };
var language = new Language(); var language = new Language();