Skip to content
Snippets Groups Projects
Commit 63a53e9d authored by hakimel's avatar hakimel
Browse files

notes window now displays correct slides when origin is different than index.html (closes #278)

parent d489ec2f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 9 additions and 2 deletions
plugin/notes/notes.html
+ 9
− 2
View file @ 63a53e9d
...@@ -89,11 +89,11 @@ ...@@ -89,11 +89,11 @@
<body> <body>
<div id="wrap-current-slide" class="slides"> <div id="wrap-current-slide" class="slides">
<iframe src="../../index.html" width="1280" height="1024" id="current-slide"></iframe> <iframe width="1280" height="1024" id="current-slide"></iframe>
</div> </div>
<div id="wrap-next-slide" class="slides"> <div id="wrap-next-slide" class="slides">
<iframe src="../../index.html" width="640" height="512" id="next-slide"></iframe> <iframe width="640" height="512" id="next-slide"></iframe>
<span>UPCOMING:</span> <span>UPCOMING:</span>
</div> </div>
<div id="notes"></div> <div id="notes"></div>
...@@ -102,6 +102,13 @@ ...@@ -102,6 +102,13 @@
<script> <script>
window.addEventListener( 'load', function() { window.addEventListener( 'load', function() {
// ASEEMK: fix for calling talk may not be at index.html.
var iframes = document.querySelectorAll( '.slides iframe' );
[].slice.call(iframes).forEach(function (iframe) {
console.log(window.opener);
iframe.src = window.opener ? window.opener.location.href : '/';
});
(function( window, undefined ) { (function( window, undefined ) {
var notes = document.getElementById( 'notes' ), var notes = document.getElementById( 'notes' ),
currentSlide = document.getElementById( 'current-slide' ), currentSlide = document.getElementById( 'current-slide' ),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment