make question regen work again

remove old question html from page, and old question's display object from memory

Author: christianp

runtime/scripts/exam.js

@@ -264,6 +264,9 @@ Exam.prototype = {
 		}
 
 		job(function() {
+			//register questions with exam display
+			this.display.initQuestionList();
+
 			//calculate max marks available in exam
 			this.mark = 0;
 

runtime/scripts/question.js

@@ -25,7 +25,7 @@ var job = Numbas.schedule.add;
 
 var tryGetAttribute = Numbas.xml.tryGetAttribute;
 
-var Question = Numbas.Question = function( exam, xml, number, loading, gscope )
+var Question = Numbas.Question = function( exam, xml, number, loading, gscope)
 {
 	var q = this;
 	q.exam = exam;

themes/default/files/index.html

@@ -240,8 +240,8 @@ <h2 data-localise="end.exam has finished"></h2>
 						<div class="carousel">
 							<div class="carouselBtn prev icon-caret-up"></div>
 							<div class="questionList">
-								<ul id="questionList" data-bind="foreach: exam.questionList">
-									<li id="questionSelector" class="questionSelector" data-bind="visible: display.visible, with: display, css: {current: $root.currentQuestion()==$data.display}, click: Numbas.controls.makeQuestionJumper(number)">
+								<ul id="questionList" data-bind="foreach: questions">
+									<li id="questionSelector" class="questionSelector" data-bind="visible: visible, css: {current: $root.currentQuestion()==$data}, click: Numbas.controls.makeQuestionJumper(question.number)">
 										<span class="name" data-bind="text: displayName"></span>
 										<div class="marks">
 											<div class="feedback-icon" data-bind="css: scoreFeedback.iconClass, attr: scoreFeedback.iconAttr"></div>

themes/default/files/scripts/display.js

@@ -296,14 +296,20 @@ display.ExamDisplay = function(e)
 }
 display.ExamDisplay.prototype = 
 {
-	e:undefined,	//reference to main exam object
+	exam: undefined,	//reference to main exam object
 
 	showTiming: function()
 	{
 		this.displayTime(R('timing.time remaining',Numbas.timing.secsToDisplayTime(this.exam.timeRemaining)));
 		this.timeSpent(Numbas.timing.secsToDisplayTime(this.exam.timeSpent));
 	},
 
+	initQuestionList: function() {
+		for(var i=0; i<this.exam.questionList.length; i++) {
+			this.questions.push(this.exam.questionList[i].display);
+		}
+	},
+
 	hideTiming: function()
 	{
 		this.displayTime('');
@@ -379,9 +385,15 @@ display.ExamDisplay.prototype =
 
 	startRegen: function() {
 		$('#questionDisplay').hide();
+		this.exam.currentQuestion.display.html.remove();
+		this.oldQuestion = this.exam.currentQuestion.display;
+		console.log(this.oldQuestion);
 	},
 
 	endRegen: function() {
+		var currentQuestion = this.exam.currentQuestion;
+		this.questions.splice(currentQuestion.number,1,currentQuestion.display);
+		ko.applyBindings(this,this.exam.currentQuestion.display.html[0]);
 		$('#questionDisplay').fadeIn(200);
 	},
 
@@ -427,8 +439,6 @@ display.QuestionDisplay = function(q)
 	this.review = function() {
 		exam.reviewQuestion(q.number);
 	}
-
-	exam.display.questions.push(this);
 }
 display.QuestionDisplay.prototype =
 {