From dd9f35d6b682ea81453dc0ffa70c4b966a652b71 Mon Sep 17 00:00:00 2001 From: Chris Wanstrath Date: Sun, 4 Sep 2011 14:21:57 -0700 Subject: [PATCH] kill bootstrap - require.js is the only special case. --- Cocoa/Classes/AtomWindowController.m | 2 +- src/{bootstrap.coffee => test.coffee} | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) rename src/{bootstrap.coffee => test.coffee} (68%) diff --git a/Cocoa/Classes/AtomWindowController.m b/Cocoa/Classes/AtomWindowController.m index 27bf20a70..71dbaefc9 100644 --- a/Cocoa/Classes/AtomWindowController.m +++ b/Cocoa/Classes/AtomWindowController.m @@ -32,7 +32,7 @@ } else { NSString *resourcePath = [[NSBundle mainBundle] resourcePath]; - NSString *bootstrapPath = [resourcePath stringByAppendingString:@"/src/bootstrap.js"]; + NSString *bootstrapPath = [resourcePath stringByAppendingString:@"/src/require.js"]; NSString *coffeePath = [resourcePath stringByAppendingString:@"/vendor/coffee-script.js"]; JSCocoa* jsc = [[JSCocoa alloc] initWithGlobalContext:[[webView mainFrame] globalContext]]; [jsc setObject:self withName:@"WindowController"]; diff --git a/src/bootstrap.coffee b/src/test.coffee similarity index 68% rename from src/bootstrap.coffee rename to src/test.coffee index ed51558e2..9ec631d98 100644 --- a/src/bootstrap.coffee +++ b/src/test.coffee @@ -1,10 +1,3 @@ -# This file is the first thing loaded on startup. - -# load require() function -root = OSX.NSBundle.mainBundle.resourcePath -code = OSX.NSString.stringWithContentsOfFile path = "#{root}/src/require.js" -__jsc__.evalJSString_withScriptPath code, path - # TODO: turn these into real unit tests OSX.NSLog 'require tests:' OSX.NSLog require.resolve 'underscore'