Merge branch 'stable'

pull/2/head
Frode Petterson 2015-10-12 09:26:04 +02:00
commit 2bc6b0598c
2 changed files with 12 additions and 1 deletions

View File

@ -110,6 +110,7 @@ H5P.QuestionSet = function (options, contentId) {
var questionInstances = [];
var $myDom;
var scoreBar;
var up;
renderSolutions = false;
// Instantiate question instances
@ -126,11 +127,21 @@ H5P.QuestionSet = function (options, contentId) {
});
}
var questionInstance = H5P.newRunnable(question, contentId, undefined, undefined, {parent: self});
questionInstance.on('resize', function () {
up = true;
self.trigger('resize');
});
questionInstances.push(questionInstance);
}
// Resize all interactions on resize
self.on('resize', function () {
if (up) {
// Prevent resizing the question again.
up = false;
return;
}
for (var i = 0; i < questionInstances.length; i++) {
questionInstances[i].trigger('resize');
}

View File

@ -4,7 +4,7 @@
"contentType": "question",
"majorVersion": 1,
"minorVersion": 5,
"patchVersion": 0,
"patchVersion": 1,
"embedTypes": [
"iframe"
],