handle unhelpful 'Script error.' message

pull/1/head
ansuz 4 years ago
parent 553f29b431
commit 59eaf8187c

@ -312,25 +312,35 @@ button.primary:hover{
return bar; return bar;
}; };
var hasErrored = false;
var updateLoadingProgress = function (data) { var updateLoadingProgress = function (data) {
if (!built) { return; } if (!built || !data) { return; }
var c = types.indexOf(data.type); var c = types.indexOf(data.type);
if (c < current) { return console.error(data); } if (c < current) { return console.error(data); }
try { try {
document.querySelector('.cp-loading-spinner-container').style.display = 'none'; document.querySelector('.cp-loading-spinner-container').style.display = 'none';
document.querySelector('.cp-loading-progress-list').innerHTML = makeList(data); document.querySelector('.cp-loading-progress-list').innerHTML = makeList(data);
document.querySelector('.cp-loading-progress-container').innerHTML = makeBar(data); document.querySelector('.cp-loading-progress-container').innerHTML = makeBar(data);
} catch (e) { console.error(e); } } catch (e) {
if (!hasErrored) { console.error(e); }
}
}; };
window.CryptPad_updateLoadingProgress = updateLoadingProgress; window.CryptPad_updateLoadingProgress = updateLoadingProgress;
window.CryptPad_loadingError = function (err) { window.CryptPad_loadingError = function (err) {
if (!built) { return; } if (!built) { return; }
hasErrored = true;
var err2;
if (err === 'Script error.') {
err2 = Messages.error_unhelpfulScriptError;
}
try { try {
var node = document.querySelector('.cp-loading-progress'); var node = document.querySelector('.cp-loading-progress');
if (node.parentNode) { node.parentNode.removeChild(node); } if (node.parentNode) { node.parentNode.removeChild(node); }
document.querySelector('.cp-loading-spinner-container').setAttribute('style', 'display:none;'); document.querySelector('.cp-loading-spinner-container').setAttribute('style', 'display:none;');
document.querySelector('#cp-loading-message').setAttribute('style', 'display:block;'); document.querySelector('#cp-loading-message').setAttribute('style', 'display:block;');
document.querySelector('#cp-loading-message').innerText = err; document.querySelector('#cp-loading-message').innerText = err2 || err;
} catch (e) { console.error(e); } } catch (e) { console.error(e); }
}; };
return function () { return function () {

@ -43,7 +43,7 @@ define([
return void console.log(); return void console.log();
} }
if (window.CryptPad_loadingError) { if (window.CryptPad_loadingError) {
window.CryptPad_loadingError(e); return void window.CryptPad_loadingError(e);
} }
throw e; throw e;
}; };

Loading…
Cancel
Save