diff --git a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee index 79af07a0ef..08cd02fd3c 100644 --- a/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee +++ b/lms/static/coffee/src/discussion/views/discussion_thread_list_view.coffee @@ -2,6 +2,7 @@ class @DiscussionThreadListView extends Backbone.View template: _.template($("#thread-list-template").html()) events: "click .search": "showSearch" + "click .browse": "toggleTopicDrop" "keyup .post-search-field": "performSearch" "click .sort-bar a": "sortThreads" @@ -32,10 +33,18 @@ class @DiscussionThreadListView extends Backbone.View @$("a[data-id='#{thread_id}']").addClass("active") showSearch: -> - @$(".search").addClass('is-open'); - @$(".browse").removeClass('is-open'); + @$(".search").addClass('is-open') + @$(".browse").removeClass('is-open') setTimeout (-> @$(".post-search-field").focus()), 200 + toggleTopicDrop: -> + @$(".browse").toggleClass('is-dropped') + if @$(".browse").hasClass('is-dropped') + @$(".board-drop-menu").show() + else + @$(".board-drop-menu").hide() + + sortThreads: (event) -> @$(".sort-bar a").removeClass("active") $(event.target).addClass("active") diff --git a/lms/static/js/discussions-temp.js b/lms/static/js/discussions-temp.js index 273e946585..67b1897459 100644 --- a/lms/static/js/discussions-temp.js +++ b/lms/static/js/discussions-temp.js @@ -26,8 +26,8 @@ var SIDEBAR_HEADER_HEIGHT = 87; $(document).ready(function() { $body = $('body'); $browse = $('.browse-search .browse'); - // $search = $('.browse-search .search'); - // $searchField = $('.post-search-field'); + $search = $('.browse-search .search'); + $searchField = $('.post-search-field'); $topicDrop = $('.board-drop-menu'); $currentBoard = $('.current-board'); $tooltip = $('
'); @@ -43,7 +43,7 @@ $(document).ready(function() { sidebarXOffset = $sidebar.offset().top; $browse.bind('click', showTopicDrop); - // $search.bind('click', showSearch); + $search.bind('click', showSearch); $topicDrop.bind('click', setTopic); $formTopicDropBtn.bind('click', showFormTopicDrop); $formTopicDropMenu.bind('click', setFormTopic); @@ -111,13 +111,13 @@ function showBrowse(e) { $searchField.val(''); } -// function showSearch(e) { -// $search.addClass('is-open'); -// $browse.removeClass('is-open'); -// setTimeout(function() { -// $searchField.focus(); -// }, 200); -// } +function showSearch(e) { + $search.addClass('is-open'); + $browse.removeClass('is-open'); + setTimeout(function() { + $searchField.focus(); + }, 200); +} function showTopicDrop(e) { e.preventDefault(); @@ -229,4 +229,4 @@ function updateSidebarDimensions(e) { $postListWrapper.css('height', (sidebarHeight - SIDEBAR_HEADER_HEIGHT - 4) + 'px'); $sidebarWidthStyles.html('.discussion-body .post-list a .title { width: ' + titleWidth + 'px !important; }'); -} \ No newline at end of file +}