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

Merge branch 'master' into OPPG-413 

Conflicts:
	h5p.module
namespaces
Frank Ronny Larsen 2013-07-08 08:56:08 +02:00
parent 5f0ba2f2a0 4d5741c47a
commit fca2d6924a
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/h5p.js
View File

@ -102,7 +102,14 @@ H5P.fullScreen = function ($el, obj) {
}; };
/** /**
* Find the path to the content files base on the id of the content. * Find the path to the content files based on the id of the content
*
* Also identifies and returns absolute paths
*
* @param string path
* Absolute path to a file, or relative path to a file in the content folder
* @param contentId
* Id of the content requesting a path
*/ */
H5P.getPath = function (path, contentId) { H5P.getPath = function (path, contentId) {
if (path.substr(0, 7) === 'http://' || path.substr(0, 8) === 'https://') { if (path.substr(0, 7) === 'http://' || path.substr(0, 8) === 'https://') {
@ -112,6 +119,19 @@ H5P.getPath = function (path, contentId) {
return H5PIntegration.getContentPath(contentId) + path; return H5PIntegration.getContentPath(contentId) + path;
}; };
/**
* THIS FUNCTION IS DEPRECATED, USE getPath INSTEAD
*
* Find the path to the content files folder based on the id of the content
*
* @param contentId
* Id of the content requesting a path
*/
H5P.getContentPath = function (contentId) {
return H5PIntegration.getContentPath(contentId);
};
// //
// Used from libraries to construct instances of other libraries' objects by // Used from libraries to construct instances of other libraries' objects by
// name. // name.