Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #169 from durin42/control-presenter-from-slides

presenter view: give the spawned slides window the ability to move our location
  • Loading branch information...
commit 711f41cb59355db862072f6c1be75b8021f042c8 2 parents 86ffe77 + d8c7afd
@goncalossilva goncalossilva authored
Showing with 21 additions and 1 deletion.
  1. +4 −0 public/js/presenter.js
  2. +17 −1 public/js/showoff.js
View
4 public/js/presenter.js
@@ -3,6 +3,10 @@ var w = null;
$(function(){
w = window.open('/' + window.location.search);
+ // Give the slide window a handle to the presenter view window.
+ // This will let either window be made fullscreen and
+ // still process slide advance/rewinds correctly.
+ w.presenterView = window;
// side menu accordian crap
$("#preso").bind("showoff:loaded", function (event) {
$(".menu > ul ul").hide()
View
18 public/js/showoff.js
@@ -223,7 +223,23 @@ function showSlide(back_step) {
var currentContent = $(currentSlide).find(".content")
currentContent.trigger("showoff:show");
- return getCurrentNotes()
+ var ret = getCurrentNotes()
+ // If we have a presenterView attribute, that means this window was
+ // opened by a presenter view, and we should poke it to make
+ // it be on the same slide as us and show the correct notes.
+ //
+ // TODO: we do this in such a hacky way to avoid ever
+ // assigning to the presenterView variable here. If we do
+ // that, we can clobber the value sent in by the parent
+ // presentation view and break the feature. Is there a better
+ // way to do this?
+ if ('presenterView' in window) {
+ var pv = window.presenterView;
+ pv.slidenum = slidenum;
+ pv.showSlide(true);
+ pv.postSlide();
+ }
+ return ret;
}
function getSlideProgress()
Please sign in to comment.
Something went wrong with that request. Please try again.