Merge branch 'release/4.2.2'

dlueth · Mar 11, 2017 · c30b01f · c30b01f
2 parents 80d688e + 4035d74
commit c30b01f
Show file tree

Hide file tree

Showing 24 changed files with 115 additions and 56 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,4 @@
+sudo: false
+language: node_js
+node_js:
+  - "6"
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "qoopido.demand",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "homepage": "https://github.com/dlueth/qoopido.demand",
   "authors": [
     "Dirk Lueth <[email protected]>"

diff --git a/demo/app/js/main.js b/demo/app/js/main.js
@@ -54,7 +54,7 @@
 		// example: configuration
 		demand.configure({
 			pattern: {
-				'/nucleus':          '//cdn.jsdelivr.net/qoopido.nucleus/2.0.1/',
+				'/nucleus':          '//cdn.jsdelivr.net/qoopido.nucleus/3.0.4/',
 				'/jquery':           '//cdn.jsdelivr.net/jquery/1.11.3/jquery.min',
 				'/jquery/ui':        '//cdn.jsdelivr.net/jquery.ui/1.11.4/jquery-ui.min',
 				'/velocity':         '//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js',
@@ -66,9 +66,9 @@
 					'/app/': function(dependencies) {
 						var fragments = [],
 							i = 0, dependency;
-
+						
 						for(; (dependency = dependencies[i]); i++) {
-							fragments.push(dependency.path);
+							fragments.push(dependency.path + '@' + dependency.version);
 						}
 
 						return '/genie/index.php?module[]=' + fragments.join('&module[]=');
@@ -81,7 +81,7 @@
 							fragments.push(dependency.path.replace(/^\/nucleus\//, '') + '.js');
 						}
 
-						return '//cdn.jsdelivr.net/g/qoopido.nucleus@2.0.1(' + fragments.join('+') + ')';
+						return '//cdn.jsdelivr.net/g/qoopido.nucleus@3.0.4(' + fragments.join('+') + ')';
 					}
 				},
 				'/demand/plugin/lzstring': {

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.2.1', cache: false }));
+	}('../dist/demand.js', 'app/js/main', { base: './', version: '4.2.2', 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