Merge pull request #2222 from edx/gprice/forum-new-post-buttons

Fix forum buttons

common/static/coffee/spec/discussion/view/discussion_view_spec_helper.coffee

@@ -105,7 +105,7 @@ class @DiscussionViewSpecHelper
         expect(view.toggleVote).toHaveBeenCalled()
         view.toggleVote.reset()
         button.trigger($.Event("keydown", {which: 13}))
-        expect(view.toggleVote).toHaveBeenCalled()
+        expect(view.toggleVote).not.toHaveBeenCalled()
         view.toggleVote.reset()
         button.trigger($.Event("keydown", {which: 32}))
-        expect(view.toggleVote).not.toHaveBeenCalled()
+        expect(view.toggleVote).toHaveBeenCalled()

common/static/coffee/src/discussion/discussion_module_view.coffee

@@ -2,9 +2,11 @@ if Backbone?
   class @DiscussionModuleView extends Backbone.View
     events:
       "click .discussion-show": "toggleDiscussion"
-      "keypress .discussion-show":
-        (event) -> DiscussionUtil.activateOnEnter(event, toggleDiscussion)
+      "keydown .discussion-show":
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleDiscussion)
       "click .new-post-btn": "toggleNewPost"
+      "keydown .new-post-btn":
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleNewPost)
       "click .new-post-cancel": "hideNewPost"
       "click .discussion-paginator a": "navigateToPage"
 
@@ -19,7 +21,7 @@ if Backbone?
       else
         @page = 1
 
-    toggleNewPost: (event) ->
+    toggleNewPost: (event) =>
       event.preventDefault()
       if !@newPostForm
         @toggleDiscussion()
@@ -38,13 +40,13 @@ if Backbone?
       event.preventDefault()
       @newPostForm.slideUp(300)
 
-    hideDiscussion: ->
+    hideDiscussion: =>
       @$("section.discussion").slideUp()
       @toggleDiscussionBtn.removeClass('shown')
       @toggleDiscussionBtn.find('.button-text').html(gettext("Show Discussion"))
       @showed = false
 
-    toggleDiscussion: (event) ->
+    toggleDiscussion: (event) =>
       if @showed
         @hideDiscussion()
       else

common/static/coffee/src/discussion/discussion_router.coffee

@@ -16,6 +16,7 @@ if Backbone?
         @nav.on "thread:created", @navigateToThread
         @newPost = $('.new-post-article')
         $('.new-post-btn').bind "click", @showNewPost
+        $('.new-post-btn').bind "keydown", (event) => DiscussionUtil.activateOnSpace(event, @showNewPost)
         $('.new-post-cancel').bind "click", @hideNewPost
 
     allThreads: ->

common/static/coffee/src/discussion/utils.coffee

@@ -88,8 +88,8 @@ class @DiscussionUtil
       "notifications_status" : "/notification_prefs/status/"
     }[name]
 
-  @activateOnEnter: (event, func) ->
-    if event.which == 13
+  @activateOnSpace: (event, func) ->
+    if event.which == 32
       event.preventDefault()
       func(event)
 

common/static/coffee/src/discussion/views/discussion_content_view.coffee

@@ -4,8 +4,8 @@ if Backbone?
   
     events:
       "click .discussion-flag-abuse": "toggleFlagAbuse"
-      "keypress .discussion-flag-abuse":
-        (event) -> DiscussionUtil.activateOnEnter(event, toggleFlagAbuse)
+      "keydown .discussion-flag-abuse":
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleFlagAbuse)
   
     attrRenderer:
       endorsed: (endorsed) ->
@@ -107,7 +107,7 @@ if Backbone?
       @model.bind('change', @renderPartialAttrs, @)
       
      
-    toggleFollowing: (event) ->
+    toggleFollowing: (event) =>
       event.preventDefault()
       $elem = $(event.target)
       url = null
@@ -122,14 +122,14 @@ if Backbone?
         url: url
         type: "POST"
 
-    toggleFlagAbuse: (event) ->
+    toggleFlagAbuse: (event) =>
       event.preventDefault()
       if window.user.id in @model.get("abuse_flaggers") or (DiscussionUtil.isFlagModerator and @model.get("abuse_flaggers").length > 0)
         @unFlagAbuse()
       else
         @flagAbuse()
       
-    flagAbuse: ->
+    flagAbuse: =>
       url = @model.urlFor("flagAbuse")
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-flag-abuse")
@@ -144,7 +144,7 @@ if Backbone?
             temp_array.push(window.user.id)
             @model.set('abuse_flaggers', temp_array)      
        
-    unFlagAbuse: ->
+    unFlagAbuse: =>
       url = @model.urlFor("unFlagAbuse")
       DiscussionUtil.safeAjax
         $elem: @$(".discussion-flag-abuse")

common/static/coffee/src/discussion/views/discussion_thread_profile_view.coffee

@@ -5,10 +5,10 @@ if Backbone?
       "click .vote-btn":
         (event) -> @toggleVote(event)
       "keydown .vote-btn":
-        (event) -> DiscussionUtil.activateOnEnter(event, @toggleVote)
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleVote)
       "click .action-follow": "toggleFollowing"
-      "keypress .action-follow":
-        (event) -> DiscussionUtil.activateOnEnter(event, toggleFollowing)
+      "keydown .action-follow":
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleFollowing)
       "click .expand-post": "expandPost"
       "click .collapse-post": "collapsePost"
 

common/static/coffee/src/discussion/views/discussion_thread_show_view.coffee

@@ -5,14 +5,14 @@ if Backbone?
       "click .vote-btn":
         (event) -> @toggleVote(event)
       "keydown .vote-btn":
-        (event) -> DiscussionUtil.activateOnEnter(event, @toggleVote)
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleVote)
       "click .discussion-flag-abuse": "toggleFlagAbuse"
-      "keypress .discussion-flag-abuse":
-        (event) -> DiscussionUtil.activateOnEnter(event, toggleFlagAbuse)
+      "keydown .discussion-flag-abuse":
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleFlagAbuse)
       "click .admin-pin": "togglePin"
       "click .action-follow": "toggleFollowing"
-      "keypress .action-follow":
-        (event) -> DiscussionUtil.activateOnEnter(event, toggleFollowing)
+      "keydown .action-follow":
+        (event) -> DiscussionUtil.activateOnSpace(event, @toggleFollowing)
       "click .action-edit": "edit"
       "click .action-delete": "_delete"
       "click .action-openclose": "toggleClosed"

common/static/coffee/src/discussion/views/thread_response_show_view.coffee

@@ -4,13 +4,13 @@ if Backbone?
         "click .vote-btn":
           (event) -> @toggleVote(event)
         "keydown .vote-btn":
-          (event) -> DiscussionUtil.activateOnEnter(event, @toggleVote)
+          (event) -> DiscussionUtil.activateOnSpace(event, @toggleVote)
         "click .action-endorse": "toggleEndorse"
         "click .action-delete": "_delete"
         "click .action-edit": "edit"
         "click .discussion-flag-abuse": "toggleFlagAbuse"
-        "keypress .discussion-flag-abuse":
-          (event) -> DiscussionUtil.activateOnEnter(event, toggleFlagAbuse)
+        "keydown .discussion-flag-abuse":
+          (event) -> DiscussionUtil.activateOnSpace(event, @toggleFlagAbuse)
 
     $: (selector) ->
         @$el.find(selector)

lms/templates/discussion/_discussion_course_navigation.html

@@ -4,6 +4,6 @@
 
 <%block name="extratabs">
 % if has_permission(user, 'create_thread', course.id):
-    <li class="right"><a href="#" class="new-post-btn"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a></li>
+    <li class="right"><a href="#" class="new-post-btn" role="button"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a></li>
 % endif
 </%block>

lms/templates/discussion/_discussion_module.html

@@ -3,5 +3,5 @@
 
 <div class="discussion-module" data-discussion-id="${discussion_id | h}">
     <a class="discussion-show control-button" href="javascript:void(0)" data-discussion-id="${discussion_id | h}" role="button"><span class="show-hide-discussion-icon"></span><span class="button-text">${_("Show Discussion")}</span></a>
-    <a href="#" class="new-post-btn"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a>    
+    <a href="#" class="new-post-btn" role="button"><span class="icon icon-edit new-post-icon"></span>${_("New Post")}</a>
 </div>