EDUCATIC
/
h5p-php-library
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release' of github.com:h5p/h5p-php-library into release

redesign-copyrights
Frode Petterson 2015-05-22 13:29:04 +02:00
parent 6ecb15a1d0 d5979f1bcc
commit 9db33dd61b
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
h5p.classes.php
View File

@ -2807,6 +2807,10 @@ class H5PContentValidator {
} }
} }
if (!(isset($semantics->optional) && $semantics->optional)) { if (!(isset($semantics->optional) && $semantics->optional)) {
if ($group === NULL) {
// Error no value. Errors aren't printed...
return;
}
foreach ($semantics->fields as $field) { foreach ($semantics->fields as $field) {
if (!(isset($field->optional) && $field->optional)) { if (!(isset($field->optional) && $field->optional)) {
// Check if field is in group. // Check if field is in group.

6
js/h5p-data-view.js
View File

@ -100,10 +100,10 @@ var H5PDataView = (function ($) {
else { else {
// Update table data // Update table data
self.updateTable(data.rows); self.updateTable(data.rows);
}
// Update pagination widget // Update pagination widget
self.updatePagination(data.num); self.updatePagination(data.num);
}
if (self.loaded !== undefined) { if (self.loaded !== undefined) {
self.loaded(); self.loaded();

1
js/h5p.js
View File

@ -889,7 +889,6 @@ H5P.getCopyrights = function (instance, parameters, contentId) {
} }
catch (err) { catch (err) {
// Failed, prevent crashing page. // Failed, prevent crashing page.
H5P.error(err);
} }
} }