Merge branch 'master' into api-1.1

2014-04-15 14:48:40 +02:00 · 2014-04-15 14:48:40 +02:00 · 8f7c1b0817
parent 272f8febb1 b6ba0e4c34
commit 8f7c1b0817
2 changed files with 4 additions and 2 deletions
--- a/js/questionset.js
+++ b/js/questionset.js
@ -20,7 +20,9 @@ H5P.QuestionSet = function (options, contentId) {
  var texttemplate =
          '<% if (introPage.showIntroPage) { %>' +
          '<div class="intro-page">' +
+          '  <% if (introPage.title) { %>' +
          '    <div class="title"><span><%= introPage.title %></span></div>' +
+          '  <% } %>' +
          '  <% if (introPage.introduction) { %>' +
          '    <div class="introduction"><%= introPage.introduction %></div>' +
          '  <% } %>' +
--- a/library.json
+++ b/library.json
@ -3,7 +3,7 @@
  "contentType": "question",
  "majorVersion": 1,
  "minorVersion": 0,
-  "patchVersion": 48,
+  "patchVersion": 49,
  "runnable": 1,
  "fullscreen": 0,
  "machineName": "H5P.QuestionSet",