Browse Source

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

hakimel 11 years ago
parent
commit
63a53e9dd1
1 changed files with 9 additions and 2 deletions
  1. 9 2
      plugin/notes/notes.html

+ 9 - 2
plugin/notes/notes.html

@@ -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 @@
 		<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' ),