HFJ-179: Prepared for new API version. Using new resize events, removed some deprecated stuff. Fixed a bug in CP editor.

pull/1/head
Frode Petterson 2014-02-24 16:26:07 +01:00
parent bf3f3d0518
commit eb7ccdd523
3 changed files with 15 additions and 41 deletions

View File

@ -121,12 +121,12 @@
}
.qs-footer a.next.button:after {
font-family: H5PFontAwesome;
font-family: H5PFontAwesome4;
content: " \f054";
}
.qs-footer a.prev.button:before {
font-family: H5PFontAwesome;
font-family: H5PFontAwesome4;
content: "\f053 ";
}
@ -135,12 +135,12 @@
}
.qs-footer a.finish.button:before {
font-family: H5PFontAwesome;
font-family: H5PFontAwesome4;
content: "\f00c ";
}
.questionset-results a.button.qs-solutionbutton:before {
font-family: H5PFontAwesome;
font-family: H5PFontAwesome4;
content: "\f06e ";
}
@ -244,4 +244,4 @@
font-style: normal;
color: #6aa81b;
text-align: left;
}
}

View File

@ -1,24 +1,5 @@
var H5P = H5P || {};
if (H5P.getPath === undefined) {
/**
* Find the path to the content files based on the id of the content
*
* Also identifies and returns absolute paths
*
* @param {String} path Absolute path to a file, or relative path to a file in the content folder
* @param {Number} contentId Identifier of the content requesting the path
* @returns {String} The path to use.
*/
H5P.getPath = function (path, contentId) {
if (path.substr(0, 7) === 'http://' || path.substr(0, 8) === 'https://') {
return path;
}
return H5PIntegration.getContentPath(contentId) + path;
};
}
/**
* Will render a Question with multiple choices for answers.
*
@ -130,13 +111,11 @@ H5P.QuestionSet = function (options, contentId) {
var question = params.questions[i];
// TODO: Render on init, inject in template.
var libraryObject = H5P.libraryFromString(question.library);
$.extend(question.params, {
displaySolutionsButton: false,
postUserStatistics: false
});
var tmp = new (H5P.classFromName(libraryObject.machineName))(question.params, contentId);
questionInstances.push(tmp);
questionInstances.push(H5P.newRunnable(question, contentId));
}
// Update button state.
@ -175,8 +154,9 @@ H5P.QuestionSet = function (options, contentId) {
$('.question-container', $myDom).hide().eq(questionNumber).show();
// Trigger resize on question in case the size of the QS has changed.
if (questionInstances[questionNumber].resize !== undefined) {
questionInstances[questionNumber].resize();
var instance = questionInstances[questionNumber];
if (instance.$ !== undefined) {
instance.$.trigger('h5pResize');
}
// Update progress indicator
@ -389,4 +369,4 @@ H5P.QuestionSet = function (options, contentId) {
defaults: defaults // Provide defaults for inspection
};
return returnObject;
};
};

View File

@ -3,11 +3,15 @@
"contentType": "question",
"majorVersion": 1,
"minorVersion": 0,
"patchVersion": 39,
"patchVersion": 40,
"runnable": 1,
"fullscreen": 0,
"machineName": "H5P.QuestionSet",
"author": "Amendor AS",
"coreApi": {
"majorVersion": 1,
"minorVersion": 1
},
"license": "cc-by-sa",
"preloadedJs": [
{"path": "js/questionset.js"}
@ -16,21 +20,11 @@
{"path": "css/questionset.css"}
],
"preloadedDependencies": [
{
"machineName": "H5P.API",
"majorVersion": 1,
"minorVersion": 0
},
{
"machineName": "EmbeddedJS",
"majorVersion": 1,
"minorVersion": 0
},
{
"machineName": "FontAwesome",
"majorVersion": 3,
"minorVersion": 1
},
{
"machineName": "H5P.Video",
"majorVersion": 1,