Merge branch 'master' into api-1.1

2014-04-15 11:33:21 +02:00 · 2014-04-15 11:33:21 +02:00 · 272f8febb1
parent 7207049c2c 61e62185a6
commit 272f8febb1
2 changed files with 4 additions and 2 deletions
--- a/js/questionset.js
+++ b/js/questionset.js
@ -21,7 +21,9 @@ H5P.QuestionSet = function (options, contentId) {
          '<% if (introPage.showIntroPage) { %>' +
          '<div class="intro-page">' +
          '  <div class="title"><span><%= introPage.title %></span></div>' +
+          '  <% if (introPage.introduction) { %>' +
          '    <div class="introduction"><%= introPage.introduction %></div>' +
+          '  <% } %>' +
          '  <div class="buttons"><a class="qs-startbutton button"><%= introPage.startButtonText %></a></div>' +
          '</div>' +
          '<% } %>' +
--- a/library.json
+++ b/library.json
@ -3,7 +3,7 @@
  "contentType": "question",
  "majorVersion": 1,
  "minorVersion": 0,
-  "patchVersion": 47,
+  "patchVersion": 48,
  "runnable": 1,
  "fullscreen": 0,
  "machineName": "H5P.QuestionSet",