Merge remote-tracking branch 'origin/master' into HFP-1905-metadata-system

pull/52/head
Oliver Tacke 2018-06-05 13:07:01 +02:00
commit 367763a215
6 changed files with 16 additions and 6 deletions

View File

@ -1797,7 +1797,7 @@ class H5PCore {
public static $coreApi = array( public static $coreApi = array(
'majorVersion' => 1, 'majorVersion' => 1,
'minorVersion' => 15 'minorVersion' => 16
); );
public static $styles = array( public static $styles = array(
'styles/h5p.css', 'styles/h5p.css',

View File

@ -1,4 +1,4 @@
var H5P = H5P || {}; var H5P = window.H5P = window.H5P || {};
/** /**
* The Event class for the EventDispatcher. * The Event class for the EventDispatcher.

View File

@ -1,4 +1,4 @@
var H5P = H5P || {}; var H5P = window.H5P = window.H5P || {};
/** /**
* Used for xAPI events. * Used for xAPI events.

View File

@ -1,4 +1,4 @@
var H5P = H5P || {}; var H5P = window.H5P = window.H5P || {};
/** /**
* The external event dispatcher. Others, outside of H5P may register and * The external event dispatcher. Others, outside of H5P may register and

View File

@ -2,7 +2,7 @@
// TODO: Should we split up the generic parts needed by the editor(and others), and the parts needed to "run" H5Ps? // TODO: Should we split up the generic parts needed by the editor(and others), and the parts needed to "run" H5Ps?
/** @namespace */ /** @namespace */
var H5P = H5P || {}; var H5P = window.H5P = window.H5P || {};
/** /**
* Tells us if we're inside of an iframe. * Tells us if we're inside of an iframe.
@ -2012,6 +2012,16 @@ H5P.createTitle = function (rawTitle, maxLength) {
} }
}; };
/**
* Get crossorigin option that is set for site. Usefull for setting crossorigin policy for elements.
*
* @returns {string|null} Returns the string that should be set as crossorigin policy for elements or null if
* no policy is set.
*/
H5P.getCrossOrigin = function () {
return H5PIntegration.crossorigin ? H5PIntegration.crossorigin : null;
};
/** /**
* Async error handling. * Async error handling.
* *

2
js/jquery.js vendored
View File

@ -5,7 +5,7 @@ return(!i||i!==r&&!b.contains(r,i))&&(e.type=o.origType,n=o.handler.apply(this,a
// Snap this specific version of jQuery into H5P. jQuery.noConflict will // Snap this specific version of jQuery into H5P. jQuery.noConflict will
// revert the globals to what they were before this file was loaded. // revert the globals to what they were before this file was loaded.
var H5P = H5P || {}; var H5P = window.H5P = window.H5P || {};
/** /**
* jQuery v1.9.1 * jQuery v1.9.1