Fixed bug in browser require inclusion

amelon · Jan 25, 2012 · a88fa6d · a88fa6d
1 parent 2968822
commit a88fa6d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/air-drop.js b/lib/air-drop.js
@@ -18,7 +18,7 @@ var AirDrop = function(name) {
     minimizer: Minimizers.None,
     shouldPackage: false,
     cacher: null,
-    explicitlyUseBrowserRequire: false
+    explicitlyUseBrowserRequire: null
   });
 
   _.extend(package, packageMethods);
@@ -87,7 +87,7 @@ var packageMethods = {
   },
 
   _shouldUseBrowserRequire: function() {
-    if(typeof this.explicitlyUseBrowserRequire !== "undefined") {
+    if(!_.isNull(this.explicitlyUseBrowserRequire)) {
       return this.explicitlyUseBrowserRequire;
     }
     var implicitUse = _(this.paths).any(function(tuple) {
@@ -129,7 +129,7 @@ var packageMethods = {
       }
 
       app.get("/air-drop/" + package.packageName + ".js", function(req, res) {
-        package.useCachedResult(package.packageName, package.source, deliverSource(req, res));
+        package.useCachedResult(package.packageName, _.bind(package.source, package), deliverSource(req, res));
       });
 
       app.get("/air-drop/" + package.packageName + "/include/:filepath", function(req, res) {
@@ -180,8 +180,7 @@ var packageMethods = {
   },
 
   _applyMinimization: function(code) {
-    if(this.minimizer) { return this.minimizer(code); }
-    return code;
+    return this.minimizer(code);
   }    
 };