Permalink
Browse files

Remove forgotten code about the reverted componentsDir option.

  • Loading branch information...
1 parent 8a49630 commit 723cfd52d172c1413fa5e96d7df6b3c63e66fdc6 @satazor satazor committed Oct 17, 2012
Showing with 10 additions and 13 deletions.
  1. +0 −1 .gitignore
  2. +9 −11 lib/core/manager.js
  3. +1 −1 package.json
View
1 .gitignore
@@ -1,4 +1,3 @@
node_modules
components
-vendor
.DS_Store
View
20 lib/core/manager.js
@@ -59,17 +59,15 @@ Manager.prototype.resolve = function () {
};
Manager.prototype.resolveLocal = function () {
- this.once('loadJSON', function () {
- glob('./' + config.directory + '/*', function (err, dirs) {
- if (err) return this.emit('error', err);
- dirs.forEach(function (dir) {
- var name = path.basename(dir);
- this.dependencies[name] = [];
- this.dependencies[name].push(new Package(name, dir, this));
- }.bind(this));
- this.emit('resolveLocal');
+ glob('./' + config.directory + '/*', function (err, dirs) {
+ if (err) return this.emit('error', err);
+ dirs.forEach(function (dir) {
+ var name = path.basename(dir);
+ this.dependencies[name] = [];
+ this.dependencies[name].push(new Package(name, dir, this));
}.bind(this));
- }.bind(this)).loadJSON();
+ this.emit('resolveLocal');
+ }.bind(this));
};
Manager.prototype.resolveEndpoints = function () {
@@ -94,8 +92,8 @@ Manager.prototype.loadJSON = function () {
fs.readFile(json, 'utf8', function (err, json) {
if (err) return this.emit('error', err);
this.json = JSON.parse(json);
+ this.name = json.name;
this.version = json.version;
- this.name = json.name;
this.emit('loadJSON');
}.bind(this));
}.bind(this));
View
2 package.json
@@ -27,7 +27,7 @@
"rc" : "latest"
},
"scripts": {
- "test": "mocha -R spec -t 30000"
+ "test": "mocha -R spec -t 15000"
},
"devDependencies": {
"mocha": "latest",

0 comments on commit 723cfd5

Please sign in to comment.