From 227e0829fdedd6085ad9e0466686dea06f82f0de Mon Sep 17 00:00:00 2001 From: Svein-Tore Griff With Date: Mon, 18 May 2015 15:14:33 +0200 Subject: [PATCH 1/3] Avoid printing very scary error message for all old interactive videos --- js/h5p.js | 1 - 1 file changed, 1 deletion(-) diff --git a/js/h5p.js b/js/h5p.js index 26c81a3..faab8e6 100644 --- a/js/h5p.js +++ b/js/h5p.js @@ -889,7 +889,6 @@ H5P.getCopyrights = function (instance, parameters, contentId) { } catch (err) { // Failed, prevent crashing page. - H5P.error(err); } } From 8e82b515a21a6016fe3d13fd323b6d9745bb133c Mon Sep 17 00:00:00 2001 From: Frode Petterson Date: Thu, 21 May 2015 09:50:58 +0200 Subject: [PATCH 2/3] Prevent updating pagination when there's no table. --- js/h5p-data-view.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/h5p-data-view.js b/js/h5p-data-view.js index d856933..6e65e98 100644 --- a/js/h5p-data-view.js +++ b/js/h5p-data-view.js @@ -100,10 +100,10 @@ var H5PDataView = (function ($) { else { // Update table data self.updateTable(data.rows); - } - // Update pagination widget - self.updatePagination(data.num); + // Update pagination widget + self.updatePagination(data.num); + } if (self.loaded !== undefined) { self.loaded(); From 99522f59bfafbe50c99b1eebde841d38b14b9357 Mon Sep 17 00:00:00 2001 From: Thomas Marstrander Date: Thu, 21 May 2015 13:02:52 +0200 Subject: [PATCH 3/3] Skip groups that are null. This is done because groups with only one entry are concatenated with their entry. --- h5p.classes.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/h5p.classes.php b/h5p.classes.php index 0bd122a..ca0fb8e 100644 --- a/h5p.classes.php +++ b/h5p.classes.php @@ -2811,6 +2811,10 @@ class H5PContentValidator { } } if (!(isset($semantics->optional) && $semantics->optional)) { + if ($group === NULL) { + // Error no value. Errors aren't printed... + return; + } foreach ($semantics->fields as $field) { if (!(isset($field->optional) && $field->optional)) { // Check if field is in group.