From 4bfd48b983b4f01e3e4b6d0437f24a55463e0aba Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Wed, 20 Nov 2013 16:55:50 -0800
Subject: [PATCH 1/2] Add setTooltip jquery function

---
 src/space-pen-extensions.coffee | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/space-pen-extensions.coffee b/src/space-pen-extensions.coffee
index 275b74131..83c5874e6 100644
--- a/src/space-pen-extensions.coffee
+++ b/src/space-pen-extensions.coffee
@@ -15,4 +15,27 @@ jQuery.cleanData = (elements) ->
       view.unsubscribe()
   originalCleanData(elements)
 
+tooltipDefaults =
+  delay:
+    show: 500
+    hide: 100
+  container: 'body'
+  html: true
+
+getKeystroke = (bindings) ->
+  if bindings and bindings.length
+    "<span class=\"keystroke\">#{bindings[0].keystroke}</span>"
+  else
+    ''
+
+jQuery.fn.setTooltip = (title, {command, commandElement}={}) ->
+  atom.requireWithGlobals('bootstrap/js/tooltip', {jQuery : jQuery})
+
+  bindings = if commandElement
+    atom.keymap.keyBindingsForCommandMatchingElement(command, commandElement)
+  else
+    atom.keymap.keyBindingsForCommand(command)
+
+  this.tooltip(jQuery.extend(tooltipDefaults, {title: "#{title} #{getKeystroke(bindings)}"}))
+
 module.exports = spacePen

From e8bfb7ca0951f5dd5ab585162246f32e34276bcd Mon Sep 17 00:00:00 2001
From: Ben Ogle <ogle.ben@gmail.com>
Date: Wed, 20 Nov 2013 17:10:57 -0800
Subject: [PATCH 2/2] Fix up things for kevin

---
 src/space-pen-extensions.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/space-pen-extensions.coffee b/src/space-pen-extensions.coffee
index 83c5874e6..c766c1288 100644
--- a/src/space-pen-extensions.coffee
+++ b/src/space-pen-extensions.coffee
@@ -23,13 +23,13 @@ tooltipDefaults =
   html: true
 
 getKeystroke = (bindings) ->
-  if bindings and bindings.length
+  if bindings?.length
     "<span class=\"keystroke\">#{bindings[0].keystroke}</span>"
   else
     ''
 
 jQuery.fn.setTooltip = (title, {command, commandElement}={}) ->
-  atom.requireWithGlobals('bootstrap/js/tooltip', {jQuery : jQuery})
+  atom.requireWithGlobals('bootstrap/js/tooltip', {jQuery})
 
   bindings = if commandElement
     atom.keymap.keyBindingsForCommandMatchingElement(command, commandElement)