Merge branch 'release/4.2.0'

dlueth · Feb 23, 2017 · e16da44 · e16da44
2 parents b16c05a + 9651066
commit e16da44
Show file tree

Hide file tree

Showing 17 changed files with 67 additions and 80 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -25,5 +25,6 @@
   "globals": {
     "demand": true,
     "provide": true
-  }
+  },
+  "root": true
 }
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "qoopido.demand",
-  "version": "4.1.9",
+  "version": "4.2.0",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "authors": [
     "Dirk Lueth <[email protected]>"

diff --git a/demo/index.html b/demo/index.html
@@ -33,7 +33,7 @@
 
 			target.parentNode.insertBefore(script, target);
 		}(window, document, 'script'))
-	}('../dist/demand.js', 'app/js/main', { base: './', version: '4.1.9', cache: false }));
+	}('../dist/demand.js', 'app/js/main', { base: './', version: '4.2.0', cache: false }));
 </script>
 </body>
 </html>
diff --git a/dist/cache/dispose.js b/dist/cache/dispose.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": "4.1.9",
+  "version": "4.2.0",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "author": {
     "name": "Dirk Lueth",

diff --git a/src/function/demand.js b/src/function/demand.js
@@ -124,6 +124,11 @@ global.demand = (function() {
 		.after(EVENT_CACHE_MISS, function(dependency) {
 			new ClassLoader(dependency);
 		})
+		.after(EVENT_POST_REQUEST, function(dependency) {
+			var pointer = dependency.handler.onPostRequest;
+
+			pointer && pointer(dependency);
+		})
 		.after(EVENT_CACHE_HIT + ' ' + EVENT_POST_REQUEST, function(dependency) {
 			singletonEvent.emit(EVENT_PRE_PROCESS, dependency.id, dependency);
 		})
@@ -132,11 +137,6 @@ global.demand = (function() {
 
 			pointer && pointer(dependency);
 		})
-		.after(EVENT_POST_REQUEST, function(dependency) {
-			var pointer = dependency.handler.onPostRequest;
-
-			pointer && pointer(dependency);
-		})
 		.after(EVENT_PRE_PROCESS, function(dependency) {
 			var pointer = dependency.handler.onPreProcess;