Merge branch 'release'

css/questionset.css

@@ -220,3 +220,9 @@
 .h5p-no-frame .questionset .h5p-question > *:last-child {
   margin-bottom: 0;
 }
+
+/* Hide retry and show solution buttons */
+.questionset .h5p-question .h5p-question-try-again,
+.questionset .h5p-question .h5p-question-show-solution {
+  display: none;
+}

js/questionset.js

@@ -363,12 +363,21 @@ H5P.QuestionSet = function (options, contentId) {
       }
     }
 
+    var registerImageLoadedListener = function (question) {
+      H5P.on(question, 'imageLoaded', function () {
+        self.trigger('resize');
+      });
+    };
+
     // Attach questions
     for (var i = 0; i < questionInstances.length; i++) {
       var question = questionInstances[i];
 
       question.attach($('.question-container:eq(' + i + ')', $myDom));
 
+      // Listen for image resize
+      registerImageLoadedListener(question);
+
       // Disable feedback for question
       question.setBehaviour({disableFeedback: true});
 
@@ -378,7 +387,7 @@ H5P.QuestionSet = function (options, contentId) {
         // Add finish question set button
         question.addButton('finish', params.texts.finishButton, function () {
           _displayEndGame();
-        });
+        }, false);
 
       } else {
 

library.json

@@ -3,8 +3,8 @@
   "description": "Put together a set of different questions that has to be solved. (Quiz)",
   "contentType": "question",
   "majorVersion": 1,
-  "minorVersion": 4,
-  "patchVersion": 2,
+  "minorVersion": 5,
+  "patchVersion": 0,
   "embedTypes": [
     "iframe"
   ],
@@ -46,7 +46,7 @@
     {
       "machineName": "H5P.JoubelUI",
       "majorVersion": 1,
-      "minorVersion": 1
+      "minorVersion": 2
     }
   ],
   "editorDependencies": [

semantics.json

@@ -106,11 +106,11 @@
       "label": "Question type",
       "description": "Library for this question.",
       "options": [
-        "H5P.MultiChoice 1.3",
-        "H5P.DragQuestion 1.4",
-        "H5P.Blanks 1.3",
-        "H5P.MarkTheWords 1.3",
-        "H5P.DragText 1.3"
+        "H5P.MultiChoice 1.4",
+        "H5P.DragQuestion 1.5",
+        "H5P.Blanks 1.4",
+        "H5P.MarkTheWords 1.4",
+        "H5P.DragText 1.4"
       ]
     }
   },