Merge branch 'master' into api-1.1

pull/1/head
Frode Petterson 2014-04-11 15:50:48 +02:00
commit 10f9a0b447
3 changed files with 9 additions and 3 deletions

1
.gitignore vendored Normal file
View File

@ -0,0 +1 @@
*~

View File

@ -404,6 +404,7 @@ H5P.QuestionSet = function (options, contentId) {
// Masquerade the main object to hide inner properties and functions.
var returnObject = {
$: $(this),
attach: attach, // Attach to DOM object
getQuestions: function () {return questionInstances;},
getScore: getScore,

View File

@ -3,7 +3,7 @@
"contentType": "question",
"majorVersion": 1,
"minorVersion": 0,
"patchVersion": 45,
"patchVersion": 46,
"runnable": 1,
"fullscreen": 0,
"machineName": "H5P.QuestionSet",
@ -14,10 +14,14 @@
},
"license": "cc-by-sa",
"preloadedJs": [
{"path": "js/questionset.js"}
{
"path": "js/questionset.js"
}
],
"preloadedCss": [
{"path": "css/questionset.css"}
{
"path": "css/questionset.css"
}
],
"preloadedDependencies": [
{