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

Merge branch 'master' into editor-padding

editor-padding
Frode Petterson 2015-09-10 14:27:37 +02:00
parent 1cf1a38a1b 2d43942c48
commit 3e54270f4b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/h5p.js
View File

@ -8,7 +8,7 @@ var H5P = H5P || {};
* Tells us if we're inside of an iframe. * Tells us if we're inside of an iframe.
* @member {boolean} * @member {boolean}
*/ */
H5P.isFramed = (window.self !== window.top); H5P.isFramed = (window.self !== window.parent);
/** /**
* jQuery instance of current window. * jQuery instance of current window.
@ -319,7 +319,7 @@ H5P.init = function (target) {
if (!H5P.isFramed || H5P.externalEmbed === false) { if (!H5P.isFramed || H5P.externalEmbed === false) {
// Resize everything when window is resized. // Resize everything when window is resized.
H5P.jQuery(window.top).resize(function () { H5P.jQuery(window.parent).resize(function () {
if (window.parent.H5P.isFullscreen) { if (window.parent.H5P.isFullscreen) {
// Use timeout to avoid bug in certain browsers when exiting fullscreen. Some browser will trigger resize before the fullscreenchange event. // Use timeout to avoid bug in certain browsers when exiting fullscreen. Some browser will trigger resize before the fullscreenchange event.
H5P.trigger(instance, 'resize'); H5P.trigger(instance, 'resize');
@ -373,7 +373,7 @@ H5P.getHeadTags = function (contentId) {
createStyleTags(H5PIntegration.contents['cid-' + contentId].styles) + createStyleTags(H5PIntegration.contents['cid-' + contentId].styles) +
createScriptTags(H5PIntegration.core.scripts) + createScriptTags(H5PIntegration.core.scripts) +
createScriptTags(H5PIntegration.contents['cid-' + contentId].scripts) + createScriptTags(H5PIntegration.contents['cid-' + contentId].scripts) +
'<script>H5PIntegration = window.top.H5PIntegration; var H5P = H5P || {}; H5P.externalEmbed = false;</script>'; '<script>H5PIntegration = window.parent.H5PIntegration; var H5P = H5P || {}; H5P.externalEmbed = false;</script>';
}; };
/** /**
@ -450,10 +450,10 @@ H5P.fullScreen = function ($element, instance, exitCallback, body) {
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.top.H5P.fullScreen($element, instance, exitCallback, H5P.$body.get()); window.parent.H5P.fullScreen($element, instance, exitCallback, H5P.$body.get());
H5P.isFullscreen = true; H5P.isFullscreen = true;
H5P.exitFullScreen = function () { H5P.exitFullScreen = function () {
window.top.H5P.exitFullScreen(); window.parent.H5P.exitFullScreen();
}; };
H5P.on(instance, 'exitFullScreen', function () { H5P.on(instance, 'exitFullScreen', function () {
H5P.isFullscreen = false; H5P.isFullscreen = false;
@ -1935,7 +1935,7 @@ H5P.createTitle = function (rawTitle, maxLength) {
// Relay events to top window. // Relay events to top window.
if (H5P.isFramed && H5P.externalEmbed === false) { if (H5P.isFramed && H5P.externalEmbed === false) {
H5P.externalDispatcher.on('*', function (event) { H5P.externalDispatcher.on('*', function (event) {
window.top.H5P.externalDispatcher.trigger.call(this, event); window.parent.H5P.externalDispatcher.trigger.call(this, event);
}); });
} }
}); });