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

Reapply 188 #193

Merged
merged 2 commits into from
Jul 30, 2014
Merged

Reapply 188 #193

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c438cb3
Pass import() options metadata as was done with define()
johnjbarton Jul 30, 2014
ae40618
Don't process module.module if module evaluation fails
johnjbarton Jul 21, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions lib/loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ function logloads(loads) {
step: options.address ? 'fetch' : 'locate',
loader: loader,
moduleName: name,
moduleMetadata: {},
moduleMetadata: options && options.metadata || {},
moduleSource: options.source,
moduleAddress: options.address
}));
Expand Down Expand Up @@ -816,14 +816,14 @@ function logloads(loads) {

module.evaluated = true;
err = doExecute(module);
if (err)
if (err) {
module.failed = true;

// spec variation
// we don't create a new module here because it was created and ammended
// we just disable further extensions instead
if (Object.preventExtensions)
} else if (Object.preventExtensions) {
// spec variation
// we don't create a new module here because it was created and ammended
// we just disable further extensions instead
Object.preventExtensions(module.module);
}

module.execute = undefined;
return err;
Expand Down