pulsar-edit/pulsar
1
1
Fork 0
mirror of https://github.com/pulsar-edit/pulsar.git synced 2024-09-20 15:37:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix remaining multi-keystroke specs

Browse Source
This commit is contained in:
Nathan Sobo 2012-06-18 17:31:26 -06:00
parent 85f695e4f1
commit 171a19369a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spec/app/keymap-spec.coffee
View File

@ -28,10 +28,10 @@ describe "Keymap", ->
fragment.on 'deleteChar', deleteCharHandler
fragment.on 'insertChar', insertCharHandler
it "adds a 'keystroke' string to the event object", ->
it "adds a 'keystrokes' string to the event object", ->
event = keydownEvent('x', altKey: true, metaKey: true)
keymap.handleKeyEvent(event)
expect(event.keystroke).toBe 'alt-meta-x'
expect(event.keystrokes).toBe 'alt-meta-x'
describe "when no binding matches the event's keystroke", ->
it "returns true, so the event continues to propagate", ->
@ -54,7 +54,7 @@ describe "Keymap", ->
expect(insertCharHandler).toHaveBeenCalled()
commandEvent = insertCharHandler.argsForCall[0][0]
expect(commandEvent.keyEvent).toBe event
expect(event.keystroke).toBe 'x'
expect(event.keystrokes).toBe 'x'
describe "when the event's target node *descends* from a selector with a matching binding", ->
it "triggers the command event associated with that binding on the target node and returns false", ->
@ -158,7 +158,7 @@ describe "Keymap", ->
expect(closeOtherWindowsHandler).toHaveBeenCalled()
describe "when a second keystroke added to the first doesn't match any bindings", ->
fit "clears the queued keystrokes without triggering any events", ->
it "clears the queued keystrokes without triggering any events", ->
expect(keymap.handleKeyEvent(keydownEvent('x', target: fragment[0], ctrlKey: true))).toBeFalsy()
expect(keymap.handleKeyEvent(keydownEvent('c', target: fragment[0]))).toBeFalsy()
expect(quitHandler).not.toHaveBeenCalled()
@ -167,7 +167,7 @@ describe "Keymap", ->
expect(keymap.handleKeyEvent(keydownEvent('c', target: fragment[0]))).toBeTruthy()
describe "when the event's target node descends from multiple nodes that match selectors with a partial binding match", ->
fit "allows any of the bindings to be triggered upon a second keystroke, favoring the most specific selector", ->
it "allows any of the bindings to be triggered upon a second keystroke, favoring the most specific selector", ->
keymap.bindKeys ".grandchild-node", 'ctrl-x ctrl-c': 'more-specific-quit'
grandchildNode = fragment.find('.grandchild-node')[0]
moreSpecificQuitHandler = jasmine.createSpy('moreSpecificQuitHandler')
@ -281,7 +281,6 @@ describe "Keymap", ->
expect(keymap.keystrokeStringForEvent(keydownEvent('left', shiftKey: true))).toBe 'shift-left'
expect(keymap.keystrokeStringForEvent(keydownEvent('Left', shiftKey: true))).toBe 'shift-left'
describe ".bindingsForElement(element)", ->
it "returns the matching bindings for the element", ->
keymap.bindKeys '.command-mode', 'c': 'c'

6
src/app/keymap.coffee
View File

@ -35,13 +35,14 @@ class Keymap
while currentNode.length
bindingSets = @bindingSets.filter (set) -> currentNode.is(set.selector)
bindingSets.sort (a, b) -> b.specificity - a.specificity
_.defaults(keystrokeMap, set.keystrokeMap) for set in bindingSets
_.defaults(keystrokeMap, set.commandsByKeystrokes) for set in bindingSets
currentNode = currentNode.parent()
keystrokeMap
handleKeyEvent: (event) ->
event.keystrokes = @multiKeystrokeStringForEvent(event)
isMultiKeystroke = @queuedKeystrokes?
@queuedKeystrokes = null
currentNode = $(event.target)
while currentNode.length
@ -59,7 +60,8 @@ class Keymap
@queuedKeystrokes = event.keystrokes
return false
currentNode = currentNode.parent()
true
!isMultiKeystroke
triggerCommandEvent: (keyEvent, commandName) ->
commandEvent = $.Event(commandName)