Move dropdown filter into a more clearly named file, discussion-filter.js, and move the
event bindings into the proper views.
This commit is contained in:
@@ -9,6 +9,7 @@ if Backbone?
|
|||||||
"click .browse-topic-drop-search-input": "ignoreClick"
|
"click .browse-topic-drop-search-input": "ignoreClick"
|
||||||
"click .post-list .list-item a": "threadSelected"
|
"click .post-list .list-item a": "threadSelected"
|
||||||
"click .post-list .more-pages a": "loadMorePages"
|
"click .post-list .more-pages a": "loadMorePages"
|
||||||
|
'keyup .browse-topic-drop-search-input': DiscussionFilter.filterDrop
|
||||||
|
|
||||||
initialize: ->
|
initialize: ->
|
||||||
@displayedCollection = new Discussion(@collection.models, pages: @collection.pages)
|
@displayedCollection = new Discussion(@collection.models, pages: @collection.pages)
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ if Backbone?
|
|||||||
"click .topic_dropdown_button": "toggleTopicDropdown"
|
"click .topic_dropdown_button": "toggleTopicDropdown"
|
||||||
"click .topic_menu_wrapper": "setTopic"
|
"click .topic_menu_wrapper": "setTopic"
|
||||||
"click .topic_menu_search": "ignoreClick"
|
"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
|
# 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.
|
# closed, we need to ignore clicks in the search field and stop propagation.
|
||||||
|
|||||||
@@ -1,49 +1,6 @@
|
|||||||
var $body;
|
var DiscussionFilter = DiscussionFilter || {};
|
||||||
var $browse;
|
|
||||||
var $search;
|
|
||||||
var $searchField;
|
|
||||||
var $currentBoard;
|
|
||||||
|
|
||||||
var $newPost;
|
DiscussionFilter.filterDrop = function (e) {
|
||||||
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) {
|
|
||||||
/*
|
/*
|
||||||
* multiple queries
|
* multiple queries
|
||||||
*/
|
*/
|
||||||
@@ -90,7 +47,7 @@ function filterDrop(e) {
|
|||||||
* single query
|
* single query
|
||||||
*/
|
*/
|
||||||
var $drop = $(e.target).parents('.topic_menu_wrapper, .browse-topic-drop-menu-wrapper');
|
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');
|
var $items = $drop.find('a');
|
||||||
|
|
||||||
if(query.length == 0) {
|
if(query.length == 0) {
|
||||||
@@ -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/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/vendor/backbone-min.js')}"></script>
|
||||||
<script type="text/javascript" src="${static.url('js/tooltips.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.tagsinput.css')}" rel="stylesheet" type="text/css">
|
||||||
<link href="${static.url('css/vendor/jquery.autocomplete.css')}" rel="stylesheet" type="text/css">
|
<link href="${static.url('css/vendor/jquery.autocomplete.css')}" rel="stylesheet" type="text/css">
|
||||||
|
|||||||
@@ -21,8 +21,6 @@
|
|||||||
|
|
||||||
<%include file="_new_post.html" />
|
<%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}">
|
<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="discussion-body">
|
||||||
<div class="sidebar"></div>
|
<div class="sidebar"></div>
|
||||||
|
|||||||
@@ -16,7 +16,6 @@
|
|||||||
<%block name="js_extra">
|
<%block name="js_extra">
|
||||||
<%include file="_js_body_dependencies.html" />
|
<%include file="_js_body_dependencies.html" />
|
||||||
<%static:js group='discussion'/>
|
<%static:js group='discussion'/>
|
||||||
<script type="text/javascript" src="${static.url('js/discussions-temp.js')}"></script>
|
|
||||||
|
|
||||||
</%block>
|
</%block>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user