self now assigned to this. Converted event handling to dependency-pro…

…mise. Commented out some initial code for watch mode (fs.watchFile).

lib/browser-require.js

@@ -45,6 +45,10 @@ function ScriptPromise (name, location, npmBase) {
 }
 
 ScriptPromise.prototype.__proto__ = EventEmitter.prototype;
+for (var k in dependencyPromise) {
+  ScriptPromise.prototype[k] = dependencyPromise[k];
+}
+
 
 ScriptPromise.modules = {};
 
@@ -144,13 +148,13 @@ ScriptPromise.lookupNpm = function (name, fn) {
 };
 
 ScriptPromise.prototype.onError = function (err) {
-  throw new Error(err);
+  throw err;
 };
 
 ScriptPromise.prototype.load = function () {
   var self = this;
   fs.readFile(this.location, 'utf8', function (err, src) {
-    if (err) return self.emit('error', err);
+    if (err) return self.trigger('error', err);
     self.src = src;
     var depNames = self.depsFor(src);
     if (!depNames.length)
@@ -172,13 +176,13 @@ ScriptPromise.prototype.load = function () {
   });
 
   // For --watch
-  fs.watchFile(this.location, function (curr, prev) {
-    if (curr.mtime.getTime() > prev.mtime.getTime()) {
-      self.reload();
-    } else {
-      throw new Error("Times are weird");
-    }
-  });
+//  fs.watchFile(this.location, function (curr, prev) {
+//    if (curr.mtime.getTime() > prev.mtime.getTime()) {
+//      self.reload();
+//    } else {
+//      throw new Error("Times are weird");
+//    }
+//  });
 }
 ScriptPromise.prototype.depsFor = function (src) {
   var re = /^[^(?:\*|\/)]*\s*require\(['"]([^'"]+)['"]\)/gm
@@ -190,23 +194,19 @@ ScriptPromise.prototype.depsFor = function (src) {
   return deps;
 };
 ScriptPromise.prototype.reload = function (src) {
-  var self;
+  var self = this;
   fs.readFile(this.location, 'utf8', function (err, src) {
-    if (err) return self.emit('error', err);
+    if (err) return self.trigger('error', err);
     self.src = src;
     // Check for dependency additions or removals
     var depNames = self.depsFor(src);
     // TODO
 
     // Notify anyone who depends on me
-    self.emit('reloaded', src);
+    self.trigger('reloaded', src);
   });
 };
 
-for (var k in dependencyPromise) {
-  ScriptPromise.prototype[k] = dependencyPromise[k];
-}
-
 function wrapDeps (script) {
   var src = {}
     , deps = script.dependenciesFor('loaded')