fix bug where rejected legacy scripts leads to terminated script exec…

…ution
dlueth · Oct 6, 2020 · 7aef0ac · 7aef0ac
1 parent 0c4cbb1
commit 7aef0ac
Show file tree

Hide file tree

Showing 15 changed files with 29 additions and 22 deletions.
diff --git a/dist/cache/dispose.js b/dist/cache/dispose.js
diff --git a/dist/cache/states.js b/dist/cache/states.js
diff --git a/dist/demand.js b/dist/demand.js
diff --git a/dist/demand.js.map b/dist/demand.js.map
diff --git a/dist/handler/css.js b/dist/handler/css.js
diff --git a/dist/handler/html.js b/dist/handler/html.js
diff --git a/dist/handler/json.js b/dist/handler/json.js
diff --git a/dist/handler/legacy.js b/dist/handler/legacy.js
diff --git a/dist/handler/text.js b/dist/handler/text.js
diff --git a/dist/plugin/cookie.js b/dist/plugin/cookie.js
diff --git a/dist/plugin/lzstring.js b/dist/plugin/lzstring.js
diff --git a/dist/plugin/sri.js b/dist/plugin/sri.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "qoopido.demand",
   "title": "Qoopido.demand",
   "description": "Promise like module loader using XHR requests and localStorage caching to dynamically load JavaScript and CSS + dynamic dependency resolution + support for custom handlers",
-  "version": "7.1.5",
+  "version": "7.1.6",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/class/dependency.js b/src/class/dependency.js
@@ -90,9 +90,10 @@ var ClassDependency = (function() {
 		self.pledge   = self.dfd.pledge;
 		self.invalid  = false;
 
-		self.pledge.then(function() {
-			self.value = functionToArray(arguments);
-		});
+		self.pledge.then(
+			function() { self.value = functionToArray(arguments); },
+			function() { processor.current && processor.process(); }
+		);
 
 		(register !== FALSE) && registry.set(self.id, self);
 

diff --git a/src/function/provide.js b/src/function/provide.js
@@ -21,7 +21,7 @@ provide = function provide() {
 		context      = this !== global ? this : NULL,
 		dependencies = validatorIsArray(arguments[uri ? 1 : 0]) ? arguments[uri ? 1 : 0] : NULL,
 		definition   = dependencies ? arguments[uri ? 2 : 1] : arguments[uri ? 1 : 0],
-		module, isThenable, isFunction;
+		module, isThenable, isFunction, value;
 
 	if(processor.current) {
 		module = processor.current;
@@ -40,8 +40,6 @@ provide = function provide() {
 				.apply(module.path, dependencies)
 				.then(
 					function() {
-						var value;
-
 						if(isFunction) {
 							try {
 								value = definition.apply(NULL, arguments);
@@ -57,7 +55,7 @@ provide = function provide() {
 									module.dfd.resolve(module.value || value);
 								}
 							} catch(error) {
-								module.dfd.reject(new ClassFailure(ERROR_PROVIDE, module.id, arguments));
+								module.dfd.reject(new ClassFailure(ERROR_PROVIDE, module.id, error));
 							}
 						} else {
 							module.dfd.resolve(definition);
@@ -69,7 +67,15 @@ provide = function provide() {
 			if(isThenable) {
 				definition.then(module.dfd.resolve, module.dfd.reject);
 			} else {
-				module.dfd.resolve(isFunction ? definition() : definition);
+				if(isFunction) {
+					try {
+						module.dfd.resolve(definition());
+					} catch (error) {
+						module.dfd.reject(new ClassFailure(ERROR_PROVIDE, module.id, error));
+					}
+				} else {
+					module.dfd.resolve(definition);
+				}
 			}
 		}