Skip to content

Make forum comment buttons activate by keyboard #2805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hkim823 merged 1 commit into from
Mar 4, 2014
Merged

Make forum comment buttons activate by keyboard #2805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions common/static/coffee/spec/discussion/view/response_comment_show_view_spec.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,23 +63,30 @@ describe 'ResponseCommentShowView', ->
@comment.unflagAbuse()
expect(@comment.get 'abuse_flaggers').toEqual []

describe 'comment deletion', ->
describe '_delete', ->

it 'triggers the delete event when the delete icon is clicked', ->
it 'triggers on the correct events', ->
DiscussionUtil.loadRoles []
@comment.updateInfo {ability: {'can_delete': true}}
@view.render()
DiscussionViewSpecHelper.checkButtonEvents(@view, "_delete", ".action-delete")

it 'triggers the delete event', ->
triggerTarget = jasmine.createSpy()
@view.bind "comment:_delete", triggerTarget
@view.render()
@view.$el.find('.action-delete').click()
@view._delete()
expect(triggerTarget).toHaveBeenCalled()

describe 'comment edit', ->
describe 'edit', ->

it 'triggers comment:edit when the edit button is clicked', ->
it 'triggers on the correct events', ->
DiscussionUtil.loadRoles []
@comment.updateInfo {ability: {'can_edit': true}}
@view.render()
DiscussionViewSpecHelper.checkButtonEvents(@view, "edit", ".action-edit")

it 'triggers comment:edit when the edit button is clicked', ->
triggerTarget = jasmine.createSpy()
@view.bind "comment:edit", triggerTarget
@view.render()
@view.$el.find(".action-edit").click()
@view.edit()
expect(triggerTarget).toHaveBeenCalled()
12 changes: 9 additions & 3 deletions common/static/coffee/src/discussion/views/response_comment_show_view.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@ if Backbone?
class @ResponseCommentShowView extends DiscussionContentView

events:
"click .action-delete": "_delete"
"click .action-edit": "edit"
"click .action-delete":
(event) -> @_delete(event)
"keydown .action-delete":
(event) -> DiscussionUtil.activateOnSpace(event, @_delete)
"click .action-edit":
(event) -> @edit(event)
"keydown .action-edit":
(event) -> DiscussionUtil.activateOnSpace(event, @edit)

tagName: "li"

Expand Down Expand Up @@ -52,7 +58,7 @@ if Backbone?
else if DiscussionUtil.isTA(@model.get("user_id"))
@$el.find("a.profile-link").after('<span class="community-ta-label">' + gettext('Community TA') + '</span>')

_delete: (event) ->
_delete: (event) =>
@trigger "comment:_delete", event

renderFlagged: =>
Expand Down