From cc0a6a2da9e6dccb69c5c772331f198deae9735d Mon Sep 17 00:00:00 2001 From: Your Name Date: Fri, 8 Feb 2013 18:03:27 -0500 Subject: [PATCH] make hide/show synchronous for cohort filters --- .redcar/lucene/segments.gen | Bin 20 -> 20 bytes .redcar/lucene_last_updated | 2 +- .redcar/storage/cursor_saver.yaml | 25 +++++++++++------- .redcar/tags | 4 +-- .../views/discussion_thread_list_view.coffee | 8 +++--- lms/static/sass/_discussion.scss | 2 +- 6 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.redcar/lucene/segments.gen b/.redcar/lucene/segments.gen index 8d63e66e19c727981a38b08b91e97d5e72335c48..2cc90a6103d80765e604017fbb94717cb90dfde0 100644 GIT binary patch literal 20 RcmezW|NlP*FkrTW(Ev=0){continue}if(f==qb){g=e.getAttribute(rb);if(g){var h,i=g.indexOf(sb);if(i>=0){f=g.substring(0,i);h=g.substring(i+1)}else{f=g;h=P}u[f]=h}}else if(f==tb){g=e.getAttribute(rb);if(g){try{A=eval(g)}catch(a){alert(ub+g+vb)}}}else if(f==wb){g=e.getAttribute(rb);if(g){try{z=eval(g)}catch(a){alert(ub+g+xb) ElOutput /home/kevin/mitx_all/mitx/lms/static/coffee/module/7-40fec654f1c6f76f154392f82caf37df.js function ElOutput(config, state) @@ -146,7 +145,6 @@ ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2f8f384f2ff10dfe7b3afd ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/3-ae3a8f704bfe7366649872bb0cee3863.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor() ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/6-7682277e07e67ea91adaf3e720f359a6.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor() ctor /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e54b5c7f7b657100c24d82263144a4fd.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor() -ctor /home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/views/discussion_thread_list_view.js function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor() dialog_cancel /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function dialog_cancel(event) dialog_check_for_ENTER /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function dialog_check_for_ENTER(event) dialog_okay /home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js function dialog_okay(event) 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 267b66b466..ffd0471dbb 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 @@ -281,11 +281,11 @@ if Backbone? @$('.cohort').hide() else discussionIds = _.map item.find(".board-name[data-discussion_id]"), (board) -> $(board).data("discussion_id").id - @retrieveDiscussions(discussionIds) + if $(event.target).attr('cohorted') == "True" - $('.cohort').show(); - else - $('.cohort').hide(); + @retrieveDiscussions(discussionIds, "function(){$('.cohort').show();}") + else + @retrieveDiscussions(discussionIds, "function(){$('.cohort').show();}") chooseCohort: (event) -> @group_id = @$('.cohort-options :selected').val() diff --git a/lms/static/sass/_discussion.scss b/lms/static/sass/_discussion.scss index a914751280..9a9ec74907 100644 --- a/lms/static/sass/_discussion.scss +++ b/lms/static/sass/_discussion.scss @@ -977,7 +977,7 @@ body.discussion { } .sort-bar { - height: 27px; + height: auto; border-bottom: 1px solid #a3a3a3; @include linear-gradient(top, rgba(255, 255, 255, .3), rgba(255, 255, 255, 0)); background-color: #aeaeae;