Did some optimization, moved more func to core and added some comments.

namespaces
Frode Petterson 2014-06-19 16:09:23 +02:00
parent 0bcfa16861
commit 41f7039cbf
1 changed files with 22 additions and 19 deletions

View File

@ -1,3 +1,4 @@
// TODO: Should we split up the generic parts needed by the editor(and others), and the parts needed to "run" H5Ps?
var H5P = H5P || {}; var H5P = H5P || {};
// Determine if we're inside an iframe. // Determine if we're inside an iframe.
@ -34,13 +35,13 @@ else if (document.documentElement.msRequestFullscreen) {
*/ */
H5P.init = function () { H5P.init = function () {
// Useful jQuery object. // Useful jQuery object.
H5P.$body = H5P.jQuery('body'); H5P.$body = H5P.jQuery(document.body);
// Prepare internal resizer for content. // Prepare internal resizer for content.
var $window = H5P.jQuery(window.top); var $window = H5P.jQuery(window.top);
// H5Ps added in normal DIV. // H5Ps added in normal DIV.
var $containers = H5P.jQuery(".h5p-content").each(function () { var $containers = H5P.jQuery(".h5p-content").each(function () {
var $element = H5P.jQuery(this); var $element = H5P.jQuery(this);
var $container = H5P.jQuery('<div class="h5p-container"></div>').appendTo($element); var $container = H5P.jQuery('<div class="h5p-container"></div>').appendTo($element);
var contentId = $element.data('content-id'); var contentId = $element.data('content-id');
@ -282,7 +283,17 @@ H5P.getPath = function (path, contentId) {
return path; return path;
} }
return H5PIntegration.getContentPath(contentId) + path; if (contentId !== undefined) {
prefix = H5PIntegration.getContentPath(contentId);
}
else if (window['H5PEditor'] !== undefined) {
prefix = H5PEditor.filesPath;
}
else {
return;
}
return window.parent.location.protocol + "//" + window.parent.location.host + prefix + '/' + path;
}; };
/** /**
@ -886,6 +897,8 @@ H5P.cloneObject = function (object, recursive) {
/** /**
* Remove all empty spaces before and after the value. * Remove all empty spaces before and after the value.
* TODO: Only include this or String.trim(). What is best? * TODO: Only include this or String.trim(). What is best?
* I'm leaning towards implementing the missing ones: http://kangax.github.io/compat-table/es5/
* So should we make this function deprecated?
* *
* @param {String} value * @param {String} value
* @returns {@exp;value@call;replace} * @returns {@exp;value@call;replace}
@ -901,13 +914,8 @@ H5P.trim = function (value) {
* @returns {Boolean} * @returns {Boolean}
*/ */
H5P.jsLoaded = function (path) { H5P.jsLoaded = function (path) {
for (var i = 0; i < H5P.loadedJs.length; i++) { H5P.loadedJs = H5P.loadedJs || [];
if (H5P.loadedJs[i] === path) { return H5P.jQuery.inArray(path, H5P.loadedJs) !== -1;
return true;
}
}
return false;
}; };
/** /**
@ -917,13 +925,8 @@ H5P.jsLoaded = function (path) {
* @returns {Boolean} * @returns {Boolean}
*/ */
H5P.cssLoaded = function (path) { H5P.cssLoaded = function (path) {
for (var i = 0; i < H5P.loadedCss.length; i++) { H5P.loadedCss = H5P.loadedCss || [];
if (H5P.loadedCss[i] === path) { return H5P.jQuery.inArray(path, H5P.loadedCss) !== -1;
return true;
}
}
return false;
}; };
/** /**
@ -984,8 +987,8 @@ if (String.prototype.trim === undefined) {
}; };
} }
// Finally, we want to run init when document is ready. But not if we're // Finally, we want to run init when document is ready.
// in an iFrame. Then we wait for parent to start init(). // TODO: Move to integration. Systems like Moodle using YUI cannot get its translations set before this starts!
if (H5P.jQuery) { if (H5P.jQuery) {
H5P.jQuery(document).ready(function () { H5P.jQuery(document).ready(function () {
if (!H5P.initialized) { if (!H5P.initialized) {