diff --git a/Atom/Classes/AtomApp.m b/Atom/Classes/AtomApp.m index da421be4e..10ad19c20 100644 --- a/Atom/Classes/AtomApp.m +++ b/Atom/Classes/AtomApp.m @@ -32,18 +32,15 @@ } } -- (BOOL)shouldRunSpecsOnEvent:(NSEvent *)event { - return [event modifierFlags] & (NSAlternateKeyMask | NSControlKeyMask | NSCommandKeyMask) && [[event charactersIgnoringModifiers] hasPrefix:@"s"]; -} - // Overridden - (void)sendEvent:(NSEvent *)event { if ([event type] != NSKeyDown) { [super sendEvent:event]; return; } - - if ([self shouldRunSpecsOnEvent:event]) { + + BOOL shouldRunSpecs = [event modifierFlags] & (NSAlternateKeyMask | NSControlKeyMask | NSCommandKeyMask) && [[event charactersIgnoringModifiers] hasPrefix:@"s"]; + if (shouldRunSpecs) { [self createSpecController]; return; } diff --git a/Atom/Classes/AtomController.m b/Atom/Classes/AtomController.m index 34bbf690e..d65af7cad 100644 --- a/Atom/Classes/AtomController.m +++ b/Atom/Classes/AtomController.m @@ -60,12 +60,9 @@ return [self initWithBootstrapScript:@"bootstrap" url:url]; } -- (BOOL)shouldReloadOnEvent:(NSEvent *)event { - return [event modifierFlags] & NSCommandKeyMask && [[event charactersIgnoringModifiers] hasPrefix:@"r"]; -} - - (BOOL)handleInputEvent:(NSEvent *)event { - if ([self shouldReloadOnEvent:event]) { + BOOL shouldReload = [event modifierFlags] & NSCommandKeyMask && [[event charactersIgnoringModifiers] hasPrefix:@"r"]; + if (shouldReload) { [self reload]; return YES; }