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

remember the jscocoa instance!

Browse Source
This commit is contained in:
Corey Johnson
2011-09-05 10:26:51 -07:00
parent e79d1eb752
commit df24e48c63
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Cocoa/Classes/AtomWindowController.h
View File

@@ -8,9 +8,12 @@
#import <Cocoa/Cocoa.h>
@class JSCocoa;
@interface AtomWindowController : NSWindowController {
IBOutlet id webView;
NSString *URL;
JSCocoa* jscocoa;
}
@property (assign) IBOutlet id webView;

10
Cocoa/Classes/AtomWindowController.m
View File

@@ -32,12 +32,12 @@
[webView setMainFrameURL:self.URL];
}
else {
JSCocoa* jsc = [[JSCocoa alloc] initWithGlobalContext:[[webView mainFrame] globalContext]];
[jsc setObject:self withName:@"WindowController"];
jscocoa = [[JSCocoa alloc] initWithGlobalContext:[[webView mainFrame] globalContext]];
[jscocoa setObject:self withName:@"WindowController"];
NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
NSString *requirePath = [resourcePath stringByAppendingString:@"/src/require.js"];
[jsc evalJSFile:requirePath];
[jscocoa evalJSFile:requirePath];
NSURL *resourceURL = [[NSBundle mainBundle] resourceURL];
NSURL *htmlURL = [resourceURL URLByAppendingPathComponent:@"static"];
@@ -48,7 +48,9 @@
}
-(BOOL) handleKeyEvent:(NSEvent *)event {
return NO;
// ICKY: Using a global function defined in App.js to deal with key events
JSValueRef returnValue = [jscocoa callJSFunctionNamed:@"handleKeyEvent" withArguments:event, nil];
return [jscocoa toBool:returnValue];
}
@end