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

Merge branch 'stable'

semantics-font
Svein-Tore Griff With 2015-04-22 22:58:00 +02:00
parent 9a37a99574 ae512b2b03
commit a0501eb861
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/h5p.js
View File

@ -67,7 +67,11 @@ H5P.init = function (target) {
// Determine if we can use full screen // Determine if we can use full screen
if (H5P.canHasFullScreen === undefined) { if (H5P.canHasFullScreen === undefined) {
H5P.canHasFullScreen = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled || document.msFullscreenEnabled) ? true : false) : true; // Restricts fullscreen when embedded.
// (embedded doesn't support semi-fullscreen solution)
H5P.canHasFullScreen = (H5P.isFramed && H5P.externalEmbed !== false) ? ((document.fullscreenEnabled || document.webkitFullscreenEnabled || document.mozFullScreenEnabled) ? true : false) : true;
// We should consider document.msFullscreenEnabled when they get their
// element sizing corrected. Ref. https://connect.microsoft.com/IE/feedback/details/838286/ie-11-incorrectly-reports-dom-element-sizes-in-fullscreen-mode-when-fullscreened-element-is-within-an-iframe
} }
// H5Ps added in normal DIV. // H5Ps added in normal DIV.
@ -1636,7 +1640,7 @@ H5P.createTitle = function(rawTitle, maxLength) {
// Cache in preloaded // Cache in preloaded
if (content.contentUserData === undefined) { if (content.contentUserData === undefined) {
content.contentUserData = preloaded = {}; content.contentUserData = preloadedData = {};
} }
if (preloadedData[subContentId] === undefined) { if (preloadedData[subContentId] === undefined) {
preloadedData[subContentId] = {}; preloadedData[subContentId] = {};