Skip to content

Commit

Permalink
Merge branch 'release/4.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Dirk Lüth committed Jan 21, 2017
2 parents 4b4ca68 + 4dc19d8 commit 2d34bca
Show file tree
Hide file tree
Showing 14 changed files with 46 additions and 24 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.0",
"version": "4.1.1",
"homepage": "https://github.com/dlueth/qoopido.demand",
"authors": [
"Dirk Lueth <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

target.parentNode.insertBefore(script, target);
}(window, document, 'script'))
}('../dist/demand.js', 'app/js/main', { base: './', version: '4.0.9', cache: false }));
}('../dist/demand.js', 'app/js/main', { base: './', version: '4.1.1', cache: false }));
</script>
</body>
</html>
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.

2 changes: 1 addition & 1 deletion 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/json.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/legacy.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/text.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/plugin/cookie.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/plugin/lzstring.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/plugin/sri.js

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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.0",
"version": "4.1.1",
"homepage": "https://github.com/dlueth/qoopido.demand",
"author": {
"name": "Dirk Lueth",
Expand Down
2 changes: 1 addition & 1 deletion src/function/demand.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ global.demand = (function() {
singletonEvent.emit(EVENT_PRE_RESOLVE, NULL, dependencies, context);

for(; (uri = dependencies[i]); i++) {
if(typeof uri === 'string') {
if(validatorIsTypeOf(uri, STRING_STRING)) {
dependencies[i] = ClassDependency.resolve(uri, context).pledge;
} else {
dependencies[i] = (deferred = ClassPledge.defer()).pledge;
Expand Down
Loading

0 comments on commit 2d34bca

Please sign in to comment.