Skip to content

Commit

Permalink
Merge branch 'release/4.1.7'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dirk Lüth committed Feb 2, 2017
2 parents f2104aa + 6d41b96 commit 9be45fc
Show file tree
Hide file tree
Showing 28 changed files with 103 additions and 75 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "qoopido.demand",
"version": "4.1.6",
"version": "4.1.7",
"homepage": "https://github.com/dlueth/qoopido.demand",
"authors": [
"Dirk Lueth <[email protected]>"
Expand Down
14 changes: 14 additions & 0 deletions demo/app/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,20 @@
.on('preProcess', function(dependency) { console.log('preProcess', dependency.id); })
.on('postProcess', function(dependency) { console.log('postProcess', dependency.id); })
*/

var regexCleanupSearch = /^\?/;

function addUrlParam(url, param, value) {
var query;

url.search = (query = (url.search || '').replace(regexCleanupSearch, '')) + (query ? '&' : '?') + param + '=' + value;

return url;
}

demand.on('preRequest', function(dependency) {
dependency.url = addUrlParam(dependency.url, 'demand', +new Date());
});

// provide a simple inline module without dependencies
function definition1() {
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

target.parentNode.insertBefore(script, target);
}(window, document, 'script'))
}('../dist/demand.js', 'app/js/main', { base: './', version: '4.1.6', cache: false }));
}('../dist/demand.js', 'app/js/main', { base: './', version: '4.1.7', cache: false }));
</script>
</body>
</html>
2 changes: 1 addition & 1 deletion dist/cache/dispose.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/demand.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/demand.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/handler/css.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/handler/css.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions dist/handler/html.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/handler/html.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 9be45fc

Please sign in to comment.