Skip to content
Snippets Groups Projects
Commit 98194fc0 authored by Jacob Poul Richardt's avatar Jacob Poul Richardt
Browse files

Going to previous slide no longer completes the slide.

parent 9912dcf7
Branches
No related tags found
No related merge requests found
......@@ -37,17 +37,17 @@ define(["require", "exports", "knockout", "Managers/Experiment", "Models/Slide"]
};
SlideShell.prototype.LoadNextSlide = function () {
var _this = this;
this.UnloadSlide();
this.UnloadSlide(true);
ExperimentManager.LoadNextSlide(function (index, questions) { return _this.SlideData(new SlideModel("Slides/Default", index, _this.AreAllQuestionsAnswered, questions)); });
};
SlideShell.prototype.GoToPreviousSlide = function () {
var _this = this;
this.UnloadSlide();
this.UnloadSlide(false);
ExperimentManager.LoadPreviousSlide(function (index, questions) { return _this.SlideData(new SlideModel("Slides/Default", index, _this.AreAllQuestionsAnswered, questions)); });
};
SlideShell.prototype.UnloadSlide = function () {
SlideShell.prototype.UnloadSlide = function (complete) {
this.IsHighlighted(false);
if (this.SlideData() != null) {
if (complete && this.SlideData() != null) {
var oldSlide = this.SlideData();
this.SlideData().Complete(function () { return ExperimentManager.CloseSlide(oldSlide.Index); });
}
......
......@@ -66,23 +66,23 @@ class SlideShell
private LoadNextSlide():void
{
this.UnloadSlide();
this.UnloadSlide(true);
ExperimentManager.LoadNextSlide((index, questions) => this.SlideData(new SlideModel("Slides/Default", index, this.AreAllQuestionsAnswered, questions)));
}
public GoToPreviousSlide():void
{
this.UnloadSlide();
this.UnloadSlide(false);
ExperimentManager.LoadPreviousSlide((index, questions) => this.SlideData(new SlideModel("Slides/Default", index, this.AreAllQuestionsAnswered, questions)));
}
private UnloadSlide():void
private UnloadSlide(complete:boolean):void
{
this.IsHighlighted(false);
if (this.SlideData() != null)
if (complete && this.SlideData() != null)
{
var oldSlide = this.SlideData();
this.SlideData().Complete(() => ExperimentManager.CloseSlide(oldSlide.Index));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment