From 54ab5980fa6feedf0c170a4193715b7a05b2aef0 Mon Sep 17 00:00:00 2001
From: Nathan Sobo <nathan@github.com>
Date: Mon, 28 Sep 2015 13:42:34 -0600
Subject: [PATCH] Assign tooltips in Atom environment constructor

---
 src/atom.coffee            | 4 ++--
 src/tooltip-manager.coffee | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/atom.coffee b/src/atom.coffee
index 12dc52516..10cb868d6 100644
--- a/src/atom.coffee
+++ b/src/atom.coffee
@@ -171,6 +171,8 @@ class Atom extends Model
     KeymapManager = require './keymap-extensions'
     @keymaps = new KeymapManager({configDirPath, resourcePath, notificationManager: @notifications})
 
+    TooltipManager = require './tooltip-manager'
+    @tooltips = new TooltipManager(keymapManager: @keymaps)
 
   reset: ->
     @config.reset()
@@ -210,7 +212,6 @@ class Atom extends Model
 
     ViewRegistry = require './view-registry'
     CommandRegistry = require './command-registry'
-    TooltipManager = require './tooltip-manager'
     PackageManager = require './package-manager'
     Clipboard = require './clipboard'
     GrammarRegistry = require './grammar-registry'
@@ -231,7 +232,6 @@ class Atom extends Model
     process.env.NODE_ENV ?= 'production' unless devMode
 
     @keymaps.subscribeToFileReadFailure()
-    @tooltips = new TooltipManager
     @commands = new CommandRegistry
     @views = new ViewRegistry
     @registerViewProviders()
diff --git a/src/tooltip-manager.coffee b/src/tooltip-manager.coffee
index 21b8b07c6..247437535 100644
--- a/src/tooltip-manager.coffee
+++ b/src/tooltip-manager.coffee
@@ -54,6 +54,8 @@ class TooltipManager
     placement: 'auto top'
     viewportPadding: 2
 
+  constructor: ({@keymapManager}) ->
+
   # Essential: Add a tooltip to the given element.
   #
   # * `target` An `HTMLElement`
@@ -81,7 +83,7 @@ class TooltipManager
     {keyBindingCommand, keyBindingTarget} = options
 
     if keyBindingCommand?
-      bindings = atom.keymaps.findKeyBindings(command: keyBindingCommand, target: keyBindingTarget)
+      bindings = @keymapManager.findKeyBindings(command: keyBindingCommand, target: keyBindingTarget)
       keystroke = getKeystroke(bindings)
       if options.title? and keystroke?
         options.title += " " + getKeystroke(bindings)