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

Merge branch 'no-url-fopen' into content-user-data

semantics-font
Frode Petterson 2015-03-23 10:02:23 +01:00
parent 67288c2a0b eee77519b7
commit bb059d63e2
2 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/h5p-x-api-event.js
View File

@ -120,7 +120,7 @@ H5P.XAPIEvent.prototype.setActor = function() {
this.data.statement.actor = { this.data.statement.actor = {
'account': { 'account': {
'name': uuid, 'name': uuid,
'homePage': window.location.origin + H5PIntegration.basePath 'homePage': H5PIntegration.siteUrl
}, },
'objectType': 'Agent' 'objectType': 'Agent'
}; };

14
js/h5p.js
View File

@ -266,20 +266,10 @@ H5P.init = function (target) {
* @returns {string} HTML * @returns {string} HTML
*/ */
H5P.getHeadTags = function (contentId) { H5P.getHeadTags = function (contentId) {
var basePath = window.location.protocol + '//' + window.location.host + H5PIntegration.basePath;
var createUrl = function (path) {
if (path.substring(0,7) !== 'http://' && path.substring(0,8) !== 'https://') {
// Not external, add base path.
path = basePath + path;
}
return path;
};
var createStyleTags = function (styles) { var createStyleTags = function (styles) {
var tags = ''; var tags = '';
for (var i = 0; i < styles.length; i++) { for (var i = 0; i < styles.length; i++) {
tags += '<link rel="stylesheet" href="' + createUrl(styles[i]) + '">'; tags += '<link rel="stylesheet" href="' + styles[i] + '">';
} }
return tags; return tags;
}; };
@ -287,7 +277,7 @@ H5P.getHeadTags = function (contentId) {
var createScriptTags = function (scripts) { var createScriptTags = function (scripts) {
var tags = ''; var tags = '';
for (var i = 0; i < scripts.length; i++) { for (var i = 0; i < scripts.length; i++) {
tags += '<script src="' + createUrl(scripts[i]) + '"></script>'; tags += '<script src="' + scripts[i] + '"></script>';
} }
return tags; return tags;
}; };