From 42486a5ee601c8c9bddf5bcc9f727cb8541a95a1 Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Mon, 26 Jan 2015 14:17:45 -0500 Subject: [PATCH 1/2] Adding ARIA label to selected conversation --- .../src/discussion/views/discussion_thread_list_view.coffee | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index b07d0ddc22..b02fa56ea9 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -243,13 +243,13 @@ if Backbone? @trigger("thread:removed", thread_id) setActiveThread: (thread_id) -> - @$(".forum-nav-thread[data-id!='#{thread_id}'] .forum-nav-thread-link").removeClass("is-active") - @$(".forum-nav-thread[data-id='#{thread_id}'] .forum-nav-thread-link").addClass("is-active") + @$(".forum-nav-thread[data-id!='#{thread_id}'] .forum-nav-thread-link").removeClass("is-active").removeAttr('aria-label') + @$(".forum-nav-thread[data-id='#{thread_id}'] .forum-nav-thread-link").addClass("is-active").attr('aria-label', 'Current conversation') goHome: -> @template = _.template($("#discussion-home").html()) $(".forum-content").html(@template) - $(".forum-nav-thread-list a").removeClass("is-active") + $(".forum-nav-thread-list a").removeClass("is-active").removeAttr('aria-label') $("input.email-setting").bind "click", @updateEmailNotifications url = DiscussionUtil.urlFor("notifications_status",window.user.get("id")) DiscussionUtil.safeAjax From d30088dd0ded7c3529dc3eb782bccb0e04dc330f Mon Sep 17 00:00:00 2001 From: Chris Rodriguez Date: Wed, 28 Jan 2015 07:53:59 -0500 Subject: [PATCH 2/2] Using .sr instead of aria-label --- .../discussion/views/discussion_thread_list_view.coffee | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index b02fa56ea9..9ac93798ec 100644 --- a/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -243,13 +243,14 @@ if Backbone? @trigger("thread:removed", thread_id) setActiveThread: (thread_id) -> - @$(".forum-nav-thread[data-id!='#{thread_id}'] .forum-nav-thread-link").removeClass("is-active").removeAttr('aria-label') - @$(".forum-nav-thread[data-id='#{thread_id}'] .forum-nav-thread-link").addClass("is-active").attr('aria-label', 'Current conversation') + @$(".forum-nav-thread-link").find(".sr").remove() + @$(".forum-nav-thread[data-id!='#{thread_id}'] .forum-nav-thread-link").removeClass("is-active") + @$(".forum-nav-thread[data-id='#{thread_id}'] .forum-nav-thread-link").addClass("is-active").find(".forum-nav-thread-wrapper-1").prepend('' + gettext("Current conversation") + '') goHome: -> @template = _.template($("#discussion-home").html()) $(".forum-content").html(@template) - $(".forum-nav-thread-list a").removeClass("is-active").removeAttr('aria-label') + $(".forum-nav-thread-list a").removeClass("is-active").find(".sr").remove() $("input.email-setting").bind "click", @updateEmailNotifications url = DiscussionUtil.urlFor("notifications_status",window.user.get("id")) DiscussionUtil.safeAjax