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

Merge branches 'master' and 'stable' of https://github.com/h5p/h5p-php-library

pull/27/head
thomasmars 2016-12-06 11:35:24 +01:00
parent c906cb7084 ece72fcfbe
commit 47c35d5135
3 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
h5p.classes.php
View File

@ -1676,7 +1676,7 @@ class H5PCore {
public static $coreApi = array( public static $coreApi = array(
'majorVersion' => 1, 'majorVersion' => 1,
'minorVersion' => 10 'minorVersion' => 11
); );
public static $styles = array( public static $styles = array(
'styles/h5p.css', 'styles/h5p.css',
@ -3056,7 +3056,9 @@ class H5PContentValidator {
$function = null; $function = null;
$field = null; $field = null;
if (count($semantics->fields) == 1 && $flatten) { $isSubContent = isset($semantics->isSubContent) && $semantics->isSubContent === TRUE;
if (count($semantics->fields) == 1 && $flatten && !$isSubContent) {
$field = $semantics->fields[0]; $field = $semantics->fields[0];
$function = $this->typeMap[$field->type]; $function = $this->typeMap[$field->type];
$this->$function($group, $field); $this->$function($group, $field);
@ -3064,7 +3066,7 @@ class H5PContentValidator {
else { else {
foreach ($group as $key => &$value) { foreach ($group as $key => &$value) {
// If subContentId is set, keep value // If subContentId is set, keep value
if($key == 'subContentId' && $value == TRUE){ if($isSubContent && ($key == 'subContentId')){
continue; continue;
} }

2
js/h5p-content-upgrade-process.js
View File

@ -182,7 +182,7 @@ H5P.ContentUpgradeProcess = (function (Version) {
break; break;
case 'group': case 'group':
if (field.fields.length === 1) { if (field.fields.length === 1 && field.isSubContent !== true) {
// Single field to process, wrapper will be skipped // Single field to process, wrapper will be skipped
self.processField(field.fields[0], params, function (err, upgradedParams) { self.processField(field.fields[0], params, function (err, upgradedParams) {
if (upgradedParams) { if (upgradedParams) {

20
js/h5p.js
View File

@ -477,6 +477,19 @@ H5P.communicator = (function () {
return (window.postMessage && window.addEventListener ? new Communicator() : undefined); return (window.postMessage && window.addEventListener ? new Communicator() : undefined);
})(); })();
/**
* Enter semi fullscreen for the given H5P instance
*
* @method semiFullScreen
* @param {H5P.jQuery} $element Content container.
* @param {Object} instance
* @param {function} exitCallback Callback function called when user exits fullscreen.
* @param {H5P.jQuery} $body For internal use. Gives the body of the iframe.
*/
H5P.semiFullScreen = function ($element, instance, exitCallback, body) {
H5P.fullScreen($element, instance, exitCallback, body, true);
};
/** /**
* Enter fullscreen for the given H5P instance. * Enter fullscreen for the given H5P instance.
* *
@ -484,15 +497,16 @@ H5P.communicator = (function () {
* @param {Object} instance * @param {Object} instance
* @param {function} exitCallback Callback function called when user exits fullscreen. * @param {function} exitCallback Callback function called when user exits fullscreen.
* @param {H5P.jQuery} $body For internal use. Gives the body of the iframe. * @param {H5P.jQuery} $body For internal use. Gives the body of the iframe.
* @param {Boolean} forceSemiFullScreen
*/ */
H5P.fullScreen = function ($element, instance, exitCallback, body) { H5P.fullScreen = function ($element, instance, exitCallback, body, forceSemiFullScreen) {
if (H5P.exitFullScreen !== undefined) { if (H5P.exitFullScreen !== undefined) {
return; // Cannot enter new fullscreen until previous is over return; // Cannot enter new fullscreen until previous is over
} }
if (H5P.isFramed && H5P.externalEmbed === false) { if (H5P.isFramed && H5P.externalEmbed === false) {
// Trigger resize on wrapper in parent window. // Trigger resize on wrapper in parent window.
window.parent.H5P.fullScreen($element, instance, exitCallback, H5P.$body.get()); window.parent.H5P.fullScreen($element, instance, exitCallback, H5P.$body.get(), forceSemiFullScreen);
H5P.isFullscreen = true; H5P.isFullscreen = true;
H5P.exitFullScreen = function () { H5P.exitFullScreen = function () {
window.parent.H5P.exitFullScreen(); window.parent.H5P.exitFullScreen();
@ -572,7 +586,7 @@ H5P.fullScreen = function ($element, instance, exitCallback, body) {
}; };
H5P.isFullscreen = true; H5P.isFullscreen = true;
if (H5P.fullScreenBrowserPrefix === undefined) { if (H5P.fullScreenBrowserPrefix === undefined || forceSemiFullScreen === true) {
// Create semi fullscreen. // Create semi fullscreen.
if (H5P.isFramed) { if (H5P.isFramed) {