Skip to content
This repository has been archived by the owner on Jul 13, 2020. It is now read-only.

Commit

Permalink
v0.17.5
Browse files Browse the repository at this point in the history
  • Loading branch information
guybedford committed Aug 6, 2015
1 parent c518b8c commit 8e73d6a
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 15 deletions.
4 changes: 2 additions & 2 deletions dist/es6-module-loader-dev.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/es6-module-loader-dev.js.map

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions dist/es6-module-loader-dev.src.js
Original file line number Diff line number Diff line change
Expand Up @@ -534,13 +534,15 @@ function logloads(loads) {
proceedToTranslate(loader, existingLoad, Promise.resolve(stepState.moduleSource));
}

return existingLoad.linkSets[0].done.then(function() {
resolve(existingLoad);
});
// a primary load -> use that existing linkset
if (existingLoad.linkSets.length)
return existingLoad.linkSets[0].done.then(function() {
resolve(existingLoad);
});
}
}

var load = createLoad(name);
var load = existingLoad || createLoad(name);

load.metadata = stepState.moduleMetadata;

Expand Down
4 changes: 2 additions & 2 deletions dist/es6-module-loader.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/es6-module-loader.js.map

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions dist/es6-module-loader.src.js
Original file line number Diff line number Diff line change
Expand Up @@ -534,13 +534,15 @@ function logloads(loads) {
proceedToTranslate(loader, existingLoad, Promise.resolve(stepState.moduleSource));
}

return existingLoad.linkSets[0].done.then(function() {
resolve(existingLoad);
});
// a primary load -> use that existing linkset
if (existingLoad.linkSets.length)
return existingLoad.linkSets[0].done.then(function() {
resolve(existingLoad);
});
}
}

var load = createLoad(name);
var load = existingLoad || createLoad(name);

load.metadata = stepState.moduleMetadata;

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "es6-module-loader",
"description": "An ES6 Module Loader shim",
"version": "0.17.4",
"version": "0.17.5",
"homepage": "https://github.com/ModuleLoader/es6-module-loader",
"author": {
"name": "Guy Bedford, Luke Hoban, Addy Osmani",
Expand Down

0 comments on commit 8e73d6a

Please sign in to comment.