Merge branch 'api-1.1' into api-1.2

pull/1/head
Frode Petterson 2014-06-26 16:23:46 +02:00
commit cdbcc3ad92
1 changed files with 4 additions and 4 deletions

View File

@ -45,9 +45,9 @@ H5P.QuestionSet = function (options, contentId) {
' <span class="progress-text"></span>' +
' <% } %>' +
' </div>' +
' <a class="prev button"><%= texts.prevButton %></a>' +
' <a class="next button"><%= texts.nextButton %></a>' +
' <a class="finish button"><%= texts.finishButton %></a>' +
' <a class="prev button" title="<%= texts.prevButton %>"></a>' +
' <a class="next button" title="<%= texts.nextButton %>"></a>' +
' <a class="finish button" title="<%= texts.finishButton %>"></a>' +
' </div>' +
'</div>';
@ -409,7 +409,7 @@ H5P.QuestionSet = function (options, contentId) {
}
return info;
}
};
// Masquerade the main object to hide inner properties and functions.
var returnObject = {