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

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

redesign-copyrights
Thomas Marstrander 2015-05-21 13:03:28 +02:00
parent 99522f59bf 8e82b515a2
commit d5979f1bcc
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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);
} }
} }