From 4e9a73cebc04168e2b78dfbd3ea58d3665c887c9 Mon Sep 17 00:00:00 2001
From: Corey Johnson <cj@github.com>
Date: Mon, 7 Nov 2011 14:55:38 -0800
Subject: [PATCH] atomController is now known as $atomController.

---
 Atom/Classes/AtomApp.m        |  1 -
 Atom/Classes/AtomController.m |  2 +-
 index.html                    |  2 +-
 src/window.coffee             | 15 ++++++++-------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Atom/Classes/AtomApp.m b/Atom/Classes/AtomApp.m
index 344fa6be8..d7ad57380 100644
--- a/Atom/Classes/AtomApp.m
+++ b/Atom/Classes/AtomApp.m
@@ -92,7 +92,6 @@
 
   NSDictionary *defaults = [NSDictionary dictionaryWithObjectsAndKeys:
                             [NSNumber numberWithBool:YES], @"WebKitDeveloperExtras", 
-                            [NSNumber numberWithBool:YES], @"WebKitScriptDebuggerEnabled",
                             nil];
   [[NSUserDefaults standardUserDefaults] registerDefaults:defaults];
 }
diff --git a/Atom/Classes/AtomController.m b/Atom/Classes/AtomController.m
index eff9c6c55..2b48bd24c 100644
--- a/Atom/Classes/AtomController.m
+++ b/Atom/Classes/AtomController.m
@@ -44,7 +44,7 @@
   [self setWindowFrameAutosaveName:@"atomController"];
 
   jscocoa =   [[JSCocoa alloc] initWithGlobalContext:[[webView mainFrame] globalContext]];
-  [jscocoa setObject:self withName:@"atomController"];
+  [jscocoa setObject:self withName:@"$atomController"];
 
   NSURL *resourceURL = [[NSBundle mainBundle] resourceURL];
   NSURL *indexURL = [resourceURL URLByAppendingPathComponent:@"index.html"];
diff --git a/index.html b/index.html
index 2914eb1a3..810766290 100644
--- a/index.html
+++ b/index.html
@@ -69,7 +69,7 @@
 <script src='src/require.js'></script>
 <script>
   window.onerror = function() {
-    atomController.webView.inspector.showConsole(true)
+    window.showConsole(true)
   }
 
   window.onload = function() {
diff --git a/src/window.coffee b/src/window.coffee
index 078c380c9..7c6d7e8c1 100644
--- a/src/window.coffee
+++ b/src/window.coffee
@@ -20,10 +20,12 @@ windowAdditions =
 
   appRoot: OSX.NSBundle.mainBundle.resourcePath
 
+  path: null
+
   startup: () ->
     KeyBinder.register "window", window
 
-    @path = atomController.path
+    @path = $atomController.path
     @setTitle _.last @path.split '/'
 
     @editor = new Editor
@@ -71,24 +73,23 @@ windowAdditions =
       require "~/.atomicity/settings.coffee"
 
   showConsole: ->
-    atomController.webView.inspector.showConsole true
+    $atomController.webView.inspector.showConsole true
 
   setTitle: (title) ->
-    atomController.window.title = title
+    $atomController.window.title = title
 
   reload: ->
-    atomController.close
+    $atomController.close
     OSX.NSApp.createController @path
 
   # Do open and close even belong here?
   open: (path) ->
-    atomController.window.makeKeyAndOrderFront atomController
+    $atomController.window.makeKeyAndOrderFront atomController
     Event.trigger 'window:open', path
 
   close: (path) ->
     extension.shutdown() for name, extension of @extensions
-
-    atomController.close
+    $atomController.close
     Event.trigger 'window:close', path
 
   # Global methods that are used by the cocoa side of things