Upgrade to underscore-plus@0.4.0

package.json

@@ -45,7 +45,7 @@
     "space-pen": "2.0.1",
     "telepath": "0.65.0",
     "temp": "0.5.0",
-    "underscore-plus": "0.3.0"
+    "underscore-plus": "0.4.0"
   },
   "devDependencies": {
     "biscotto": "0.0.17",

spec/space-pen-extensions-spec.coffee

@@ -53,15 +53,15 @@ describe "SpacePen extensions", ->
       expect(eventHandler).toHaveBeenCalled()
 
   describe "tooltips", ->
-    describe "replaceModifiers", ->
-      replaceModifiers = $.fn.setTooltip.replaceModifiers
+    describe "humanizeKeystrokes", ->
+      humanizeKeystrokes = $.fn.setTooltip.humanizeKeystrokes
 
       it "replaces single keystroke", ->
-        expect(replaceModifiers('cmd-O')).toEqual '⌘⇧O'
-        expect(replaceModifiers('cmd-shift-up')).toEqual '⌘⇧↑'
-        expect(replaceModifiers('cmd-option-down')).toEqual '⌘⌥↓'
-        expect(replaceModifiers('cmd-option-left')).toEqual '⌘⌥←'
-        expect(replaceModifiers('cmd-option-right')).toEqual '⌘⌥→'
+        expect(humanizeKeystrokes('cmd-O')).toEqual '⌘⇧O'
+        expect(humanizeKeystrokes('cmd-shift-up')).toEqual '⌘⇧↑'
+        expect(humanizeKeystrokes('cmd-option-down')).toEqual '⌘⌥↓'
+        expect(humanizeKeystrokes('cmd-option-left')).toEqual '⌘⌥←'
+        expect(humanizeKeystrokes('cmd-option-right')).toEqual '⌘⌥→'
 
       it "replaces multiple keystroke", ->
-        expect(replaceModifiers('cmd-o ctrl-2')).toEqual '⌘O ⌃2'
+        expect(humanizeKeystrokes('cmd-o ctrl-2')).toEqual '⌘O ⌃2'

src/space-pen-extensions.coffee

@@ -24,41 +24,14 @@ tooltipDefaults =
   placement: 'auto top'
   viewportPadding: 2
 
-modifiers =
-  cmd: '⌘'
-  ctrl: '⌃'
-  alt: '⌥'
-  option: '⌥'
-  shift: '⇧'
-  enter: '⏎'
-  left: '←'
-  right: '→'
-  up: '↑'
-  down: '↓'
-
-replaceKey = (key) ->
-  if modifiers[key]
-    modifiers[key]
-  else if key.length == 1 and key == key.toUpperCase() and key.toUpperCase() != key.toLowerCase()
-    [modifiers.shift, key.toUpperCase()]
-  else if key.length == 1
-    key.toUpperCase()
-  else
-    key
-
-replaceModifiersInSingleKeystroke = (keystroke) ->
-  keys = keystroke.split('-')
-  keys = _.flatten(replaceKey(key) for key in keys)
-  keys.join('')
-
-replaceModifiers = (keystroke) ->
+humanizeKeystrokes = (keystroke) ->
   keystrokes = keystroke.split(' ')
-  keystrokes = (replaceModifiersInSingleKeystroke(stroke) for stroke in keystrokes)
+  keystrokes = (_.humanizeKeystroke(stroke) for stroke in keystrokes)
   keystrokes.join(' ')
 
 getKeystroke = (bindings) ->
   if bindings?.length
-    "<span class=\"keystroke\">#{replaceModifiers(bindings[0].keystroke)}</span>"
+    "<span class=\"keystroke\">#{humanizeKeystrokes(bindings[0].keystroke)}</span>"
   else
     ''
 # options from http://getbootstrap.com/javascript/#tooltips
@@ -87,6 +60,6 @@ jQuery.fn.destroyTooltip = ->
   @tooltip('destroy')
 
 jQuery.fn.setTooltip.getKeystroke = getKeystroke
-jQuery.fn.setTooltip.replaceModifiers = replaceModifiers
+jQuery.fn.setTooltip.humanizeKeystrokes = humanizeKeystrokes
 
 module.exports = spacePen