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

Fixed error handling.

semantics-font
Frode Petterson 2015-03-04 11:30:20 +01:00
parent c91391e0bc
commit 6d4caf855d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/h5p-content-upgrade-worker.js
View File

@ -23,7 +23,7 @@ var messageHandlers = {
postMessage({ postMessage({
action: 'error', action: 'error',
id: job.id, id: job.id,
err: err err: err.message ? err.message : err
}); });
return; return;

10
js/h5p-content-upgrade.js
View File

@ -381,6 +381,8 @@
* @param {Function} next * @param {Function} next
*/ */
ContentUpgrade.prototype.loadScript = function (url, next) { ContentUpgrade.prototype.loadScript = function (url, next) {
var self = this;
if (scriptsCache[url] !== undefined) { if (scriptsCache[url] !== undefined) {
next(); next();
return; return;
@ -406,14 +408,16 @@
* *
*/ */
ContentUpgrade.prototype.printError = function (error) { ContentUpgrade.prototype.printError = function (error) {
var self = this;
if (error.type === 'errorParamsBroken') { if (error.type === 'errorParamsBroken') {
error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken; // TODO: Translate! error = info.errorContent.replace('%id', error.id) + ' ' + info.errorParamsBroken;
} }
else if (error.type === 'scriptMissing') { else if (error.type === 'scriptMissing') {
error.err = info.errorScript.replace('%lib', error.library); error = info.errorScript.replace('%lib', error.library);
} }
self.setStatus('<p>' + info.error + '<br/>' + error.err + '</p>'); self.setStatus('<p>' + info.error + '<br/>' + error + '</p>');
}; };
})(H5P.jQuery, H5P.Version); })(H5P.jQuery, H5P.Version);