Merge branch 'master' into copy-and-paste

pull/6/head
Paal Joergensen 2015-10-06 14:00:08 +02:00
commit 78c06fb42a
2 changed files with 9 additions and 1 deletions

View File

@ -2377,7 +2377,7 @@ class H5PCore {
$platformInfo['uuid'] = $this->h5pF->getOption('site_uuid', ''); $platformInfo['uuid'] = $this->h5pF->getOption('site_uuid', '');
// Adding random string to GET to be sure nothing is cached // Adding random string to GET to be sure nothing is cached
$random = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 5); $random = substr(str_shuffle("0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"), 0, 5);
$json = $this->h5pF->fetchExternalData('https://h5p.org/libraries-metadata.json?api=1&platform=' . urlencode(json_encode($platformInfo)) . '&x=' . urlencode($random)); $json = $this->h5pF->fetchExternalData('http://h5p.org/libraries-metadata.json?api=1&platform=' . urlencode(json_encode($platformInfo)) . '&x=' . urlencode($random));
if ($json !== NULL) { if ($json !== NULL) {
$json = json_decode($json); $json = json_decode($json);
if (isset($json->libraries)) { if (isset($json->libraries)) {

View File

@ -49,6 +49,14 @@ html.h5p-iframe .h5p-semi-fullscreen .h5p-content {
position: relative; position: relative;
z-index: 1; z-index: 1;
} }
.h5p-iframe-wrapper.h5p-fullscreen {
background-color: #000;
}
body.h5p-semi-fullscreen {
position: fixed;
width: 100%;
height: 100%;
}
.h5p-container.h5p-semi-fullscreen { .h5p-container.h5p-semi-fullscreen {
position: fixed; position: fixed;
top: 0; top: 0;