D9399.id22424.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D9399.id22424.diff
View Options

	diff --git a/webroot/rsrc/externals/javelin/lib/Resource.js b/webroot/rsrc/externals/javelin/lib/Resource.js
	--- a/webroot/rsrc/externals/javelin/lib/Resource.js
	+++ b/webroot/rsrc/externals/javelin/lib/Resource.js
	@@ -135,14 +135,23 @@
	delete JX.Resource._loading[uri];
	JX.Resource._loaded[uri] = true;

	+ var errors = [];
	for (ii = 0; ii < list.length; ii++) {
	current = list[ii];
	delete current.resources[uri];
	if (!JX.Resource._hasResources(current.resources)) {
	- current.callback();
	+ try {
	+ current.callback();
	+ } catch (error) {
	+ errors.push(error);
	+ }
	list.splice(ii--, 1);
	}
	}
	+
	+ if (errors.length) {
	+ throw errors[0];
	+ }
	},

	_hasResources: function(resources) {
	diff --git a/webroot/rsrc/js/application/countdown/timer.js b/webroot/rsrc/js/application/countdown/timer.js
	--- a/webroot/rsrc/js/application/countdown/timer.js
	+++ b/webroot/rsrc/js/application/countdown/timer.js
	@@ -6,7 +6,12 @@

	JX.behavior('countdown-timer', function(config) {

	- var container = JX.$(config.container);
	+ try {
	+ var container = JX.$(config.container);
	+ } catch (ignored) {
	+ return;
	+ }
	+
	calculateTimeLeft();

	function setComponent(which, content) {