From bb6f4cdb2eeac002c7809aa7f888b4fa5cf54d1b Mon Sep 17 00:00:00 2001
From: Ibrahim Awwal <ibrahim.awwal@gmail.com>
Date: Mon, 17 Sep 2012 18:07:52 -0700
Subject: [PATCH] Move dropdown filter into a more clearly named file,
 discussion-filter.js, and move the event bindings into the proper views.

---
 .../views/discussion_thread_list_view.coffee  |  1 +
 .../src/discussion/views/new_post_view.coffee |  1 +
 ...scussions-temp.js => discussion-filter.js} | 49 ++-----------------
 .../discussion/_js_head_dependencies.html     |  1 +
 lms/templates/discussion/index.html           |  2 -
 lms/templates/discussion/single_thread.html   |  1 -
 6 files changed, 6 insertions(+), 49 deletions(-)
 rename lms/static/js/{discussions-temp.js => discussion-filter.js} (57%)

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 6b8abbdc91..d998763f50 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
@@ -9,6 +9,7 @@ if Backbone?
       "click .browse-topic-drop-search-input": "ignoreClick"
       "click .post-list .list-item a": "threadSelected"
       "click .post-list .more-pages a": "loadMorePages"
+      'keyup .browse-topic-drop-search-input': DiscussionFilter.filterDrop
 
     initialize: ->
       @displayedCollection = new Discussion(@collection.models, pages: @collection.pages)
diff --git a/lms/static/coffee/src/discussion/views/new_post_view.coffee b/lms/static/coffee/src/discussion/views/new_post_view.coffee
index ac5d43b60d..1c49fdbc8e 100644
--- a/lms/static/coffee/src/discussion/views/new_post_view.coffee
+++ b/lms/static/coffee/src/discussion/views/new_post_view.coffee
@@ -21,6 +21,7 @@ if Backbone?
           "click  .topic_dropdown_button":    "toggleTopicDropdown"
           "click  .topic_menu_wrapper":       "setTopic"
           "click  .topic_menu_search":        "ignoreClick"
+          "keyup .form-topic-drop-search-input": DiscussionFilter.filterDrop
 
       # Because we want the behavior that when the body is clicked the menu is
       # closed, we need to ignore clicks in the search field and stop propagation.
diff --git a/lms/static/js/discussions-temp.js b/lms/static/js/discussion-filter.js
similarity index 57%
rename from lms/static/js/discussions-temp.js
rename to lms/static/js/discussion-filter.js
index 9ca1a9ba8f..31ef3a8a07 100644
--- a/lms/static/js/discussions-temp.js
+++ b/lms/static/js/discussion-filter.js
@@ -1,49 +1,6 @@
-var $body;
-var $browse;
-var $search;
-var $searchField;
-var $currentBoard;
+var DiscussionFilter = DiscussionFilter || {};
 
-var $newPost;
-var $sidebar;
-var $sidebarWidthStyles;
-var $postListWrapper;
-var $discussionBody;
-var sidebarWidth;
-var sidebarXOffset;
-var scrollTop;
-
-
-$(document).ready(function() {
-	$body = $('body');
-	//$browse = $('.browse-search .browse');
-	//$search = $('.browse-search .search');
-	$searchField = $('.post-search-field');
-	//$topicDrop = $('.browse-topic-drop-menu-wrapper');
-	$currentBoard = $('.current-board');
-
-	$newPost = $('.new-post-article');
-	$sidebar = $('.sidebar');
-	$discussionBody = $('.discussion-body');
-	$postListWrapper = $('.post-list-wrapper');
-	// $dropFilter = $('.browse-topic-drop-search-input');
-	// $topicFilter = $('.topic-drop-search-input');
-	$sidebarWidthStyles = $('<style></style>');
-	$body.append($sidebarWidthStyles);
-
-	sidebarWidth = $('.sidebar').width();
-	sidebarXOffset = $sidebar.offset().top;
-
-	//$browse.bind('click', showTopicDrop);
-	//$search.bind('click', showSearch);
-	// $topicDrop.bind('click', setTopic);
-//	$formTopicDropBtn.bind('click', showFormTopicDrop);
-//	$formTopicDropMenu.bind('click', setFormTopic);
-
-	$body.delegate('.browse-topic-drop-search-input, .form-topic-drop-search-input', 'keyup', filterDrop);
-});
-
-function filterDrop(e) {
+DiscussionFilter.filterDrop = function (e) {
 	/*
 	 * multiple queries
 	 */
@@ -90,7 +47,7 @@ function filterDrop(e) {
 	 * single query
 	 */
 	var $drop = $(e.target).parents('.topic_menu_wrapper, .browse-topic-drop-menu-wrapper');
-	var query = $(this).val();
+	var query = $(e.target).val();
 	var $items = $drop.find('a');
 
 	if(query.length == 0) {
diff --git a/lms/templates/discussion/_js_head_dependencies.html b/lms/templates/discussion/_js_head_dependencies.html
index e2adea7899..c3a764439c 100644
--- a/lms/templates/discussion/_js_head_dependencies.html
+++ b/lms/templates/discussion/_js_head_dependencies.html
@@ -13,6 +13,7 @@
 <script type="text/javascript" src="${static.url('js/vendor/underscore-min.js')}"></script>
 <script type="text/javascript" src="${static.url('js/vendor/backbone-min.js')}"></script>
 <script type="text/javascript" src="${static.url('js/tooltips.js')}"></script>
+<script type="text/javascript" src="${static.url('js/discussion-filter.js')}"></script>
 
 <link href="${static.url('css/vendor/jquery.tagsinput.css')}" rel="stylesheet" type="text/css">
 <link href="${static.url('css/vendor/jquery.autocomplete.css')}" rel="stylesheet" type="text/css">
diff --git a/lms/templates/discussion/index.html b/lms/templates/discussion/index.html
index fc96640a35..8f04470506 100644
--- a/lms/templates/discussion/index.html
+++ b/lms/templates/discussion/index.html
@@ -21,8 +21,6 @@
 
 <%include file="_new_post.html" />
 
-<script type="text/javascript" src="${static.url('js/discussions-temp.js')}"></script>
-
 <section class="discussion container" id="discussion-container" data-roles="${roles}" data-course-id="${course_id}" data-user-info="${user_info}" data-threads="${threads}" data-thread-pages="${thread_pages}">
     <div class="discussion-body">
         <div class="sidebar"></div>
diff --git a/lms/templates/discussion/single_thread.html b/lms/templates/discussion/single_thread.html
index 9ec05b1534..c890c7350f 100644
--- a/lms/templates/discussion/single_thread.html
+++ b/lms/templates/discussion/single_thread.html
@@ -16,7 +16,6 @@
 <%block name="js_extra">
 <%include file="_js_body_dependencies.html" />
 <%static:js group='discussion'/>
-<script type="text/javascript" src="${static.url('js/discussions-temp.js')}"></script>
 
 </%block>