github/atom
1
1
Fork 0
mirror of https://github.com/atom/atom.git synced 2026-01-23 13:58:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

kill bootstrap - require.js is the only special case.

Browse Source
This commit is contained in:
Chris Wanstrath
2011-09-04 14:21:57 -07:00
parent 804b67f8df
commit dd9f35d6b6
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Cocoa/Classes/AtomWindowController.m
View File

@@ -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"];

7
src/bootstrap.coffee → src/test.coffee
View File

@@ -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'