Merge branch 'release/4.1.0'

dlueth · Jan 20, 2017 · 4b4ca68 · 4b4ca68
2 parents 62e85be + 587626d
commit 4b4ca68
Show file tree

Hide file tree

Showing 12 changed files with 22 additions and 16 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "qoopido.demand",
-  "version": "4.0.9",
+  "version": "4.1.0",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "authors": [
     "Dirk Lueth <[email protected]>"

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/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": "4.0.9",
+  "version": "4.1.0",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/function/demand.js b/src/function/demand.js
@@ -28,12 +28,18 @@ global.demand = (function() {
 	function demand() {
 		var dependencies = arrayPrototypeSlice.call(arguments),
 			context      = this !== global ? this : NULL,
-			i = 0, uri, result;
-
+			i = 0, uri, deferred, result;
+		
 		singletonEvent.emit(EVENT_PRE_RESOLVE, NULL, dependencies, context);
-
+		
 		for(; (uri = dependencies[i]); i++) {
-			dependencies[i] = ClassDependency.resolve(uri, context).pledge;
+			if(typeof uri === 'string') {
+				dependencies[i] = ClassDependency.resolve(uri, context).pledge;
+			} else {
+				dependencies[i] = (deferred = ClassPledge.defer()).pledge;
+
+				deferred.resolve(uri);
+			}
 		}
 
 		if(dependencies.length > 1) {