Skip to content

Commit

Permalink
Update dist to use an array of objects.
Browse files Browse the repository at this point in the history
  • Loading branch information
rwjblue committed Jun 11, 2015
1 parent 0b8d878 commit 0fad9f4
Show file tree
Hide file tree
Showing 7 changed files with 29 additions and 20 deletions.
2 changes: 1 addition & 1 deletion dist/ember-resolver-spade.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ember-resolver-tests.js

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions dist/ember-resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,14 +342,17 @@ define("ember/resolver",
var moduleEntries = requirejs.entries;
var moduleKeys = Ember.keys(moduleEntries);

var items = makeDictionary();
var items = [];
for (var index = 0, length = moduleKeys.length; index < length; index++) {
var moduleName = moduleKeys[index];
var fullname = this.translateToContainerFullname(type, moduleName);


if (fullname) {
items[fullname] = this._extractDefaultExport(moduleName);
items.push({
key: fullname,
module: moduleName,
factory: this._extractDefaultExport(moduleName)
});
}
}

Expand Down
2 changes: 1 addition & 1 deletion dist/ember-resolver.min.js

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

9 changes: 6 additions & 3 deletions dist/ember-resolver.prod.js
Original file line number Diff line number Diff line change
Expand Up @@ -342,14 +342,17 @@ define("ember/resolver",
var moduleEntries = requirejs.entries;
var moduleKeys = Ember.keys(moduleEntries);

var items = makeDictionary();
var items = [];
for (var index = 0, length = moduleKeys.length; index < length; index++) {
var moduleName = moduleKeys[index];
var fullname = this.translateToContainerFullname(type, moduleName);


if (fullname) {
items[fullname] = this._extractDefaultExport(moduleName);
items.push({
key: fullname,
module: moduleName,
factory: this._extractDefaultExport(moduleName)
});
}
}

Expand Down
16 changes: 8 additions & 8 deletions dist/modules/ember-resolver-tests.js
Original file line number Diff line number Diff line change
Expand Up @@ -347,10 +347,10 @@ test('it provides eachForType which invokes the callback for each item found', f

var items = resolver.eachForType('fruit');

deepEqual(items, {
'fruit:apple': apple,
'fruit:orange': orange
});
deepEqual(items, [
{ key: 'fruit:orange', module: 'appkit/fruits/orange', factory: orange},
{ key: 'fruit:apple', module: 'appkit/fruits/apple', factory: apple}
]);
});

test('eachForType can find both pod and non-pod factories', function() {
Expand All @@ -366,10 +366,10 @@ test('eachForType can find both pod and non-pod factories', function() {

var items = resolver.eachForType('fruit');

deepEqual(items, {
'fruit:orange': orange,
'fruit:lemon': lemon
});
deepEqual(items, [
{ key: 'fruit:orange', module: 'appkit/fruits/orange', factory: orange},
{ key: 'fruit:lemon', module: 'appkit/lemon/fruit', factory: lemon}
]);
});

module("Logging", {
Expand Down
9 changes: 6 additions & 3 deletions dist/modules/ember-resolver.js
Original file line number Diff line number Diff line change
Expand Up @@ -332,14 +332,17 @@ define("ember/resolver",
var moduleEntries = requirejs.entries;
var moduleKeys = Ember.keys(moduleEntries);

var items = makeDictionary();
var items = [];
for (var index = 0, length = moduleKeys.length; index < length; index++) {
var moduleName = moduleKeys[index];
var fullname = this.translateToContainerFullname(type, moduleName);


if (fullname) {
items[fullname] = this._extractDefaultExport(moduleName);
items.push({
key: fullname,
module: moduleName,
factory: this._extractDefaultExport(moduleName)
});
}
}

Expand Down

0 comments on commit 0fad9f4

Please sign in to comment.