Merge branch 'api-1.1' into api-1.2

pull/1/head
Frode Petterson 2014-04-30 12:20:44 +02:00
commit 5ec069dad4
3 changed files with 19 additions and 9 deletions

View File

@ -64,7 +64,6 @@ H5P.QuestionSet = function (options, contentId) {
var defaults = {
randomOrder: false,
initialQuestion: 0,
backgroundImage: undefined,
progressType: 'dots',
passPercentage: 50,
questions: [],
@ -90,9 +89,7 @@ H5P.QuestionSet = function (options, contentId) {
scoreString: 'You got @score points of @total possible.',
finishButtonText: 'Finish',
solutionButtonText: 'Show solution',
showAnimations: false,
successVideo: undefined,
failVideo: undefined
showAnimations: false
},
postUserStatistics: (H5P.postUserStatistics === true)
};
@ -106,10 +103,6 @@ H5P.QuestionSet = function (options, contentId) {
var $myDom;
renderSolutions = false;
// if (params.randomOrder) {
// // TODO: Randomize order of questions
// }
// Instantiate question instances
for (var i = 0; i < params.questions.length; i++) {
var question = params.questions[i];
@ -294,6 +287,16 @@ H5P.QuestionSet = function (options, contentId) {
});
}
if (params.introPage.backgroundImage !== undefined) {
var $intro = $myDom.find('.intro-page');
if ($intro.length) {
$intro.css({
background: '#000 url("' + H5P.getPath(params.introPage.backgroundImage.path, contentId) + '") no-repeat 50% 50%',
backgroundSize: '100% auto'
});
}
}
// Attach questions
for (var i = 0; i < questionInstances.length; i++) {
var question = questionInstances[i];

View File

@ -3,7 +3,7 @@
"contentType": "question",
"majorVersion": 1,
"minorVersion": 0,
"patchVersion": 49,
"patchVersion": 52,
"runnable": 1,
"fullscreen": 0,
"machineName": "H5P.QuestionSet",

View File

@ -97,6 +97,13 @@
"label": "Start button text",
"optional": true,
"default": "Start Quiz"
},
{
"name": "backgroundImage",
"type": "image",
"label": "Background image",
"optional": true,
"description": "An optional background image for the introduction."
}
]
},