Allow the stream and user lists to scroll with mousewheel.

The previous commit stopped the mousewheel event at .bottom_sidebar,
which means it was never getting to our individual scrolling lists.

(imported from commit 92d32c21bb596d0e14d887ff779a857223d45342)
This commit is contained in:
Waseem Daher 2013-02-12 10:31:55 -05:00
parent 55b05d7bd2
commit c3cb9a6246
2 changed files with 8 additions and 8 deletions

View File

@ -119,10 +119,9 @@ var people_list = [
<li id="filtpers"><a href="#narrow/is/private-message">All private messages</a></li>
</div>
<hr id="stream_filters_sep">
<div id="stream_filters">
</div>
<div id="stream_filters" class="scrolling_list"></div>
<hr />
<div id="user_presences"></div>
<div id="user_presences" class="scrolling_list"></div>
</ul>
</div>
</div>

View File

@ -571,11 +571,12 @@ $(function () {
$(window).resize($.throttle(50, resizehandler));
// Scrolling in modals and input boxes should not scroll the main view.
// Stop propagation in all cases. Also, ignore the event if the element
// is already at the top or bottom. Otherwise we get a new scroll event
// on the parent (?).
$('.modal-body, .bottom_sidebar, input, textarea').mousewheel(function (e, delta) {
// Scrolling in modals, input boxes, and other elements that
// explicitly scroll should not scroll the main view. Stop
// propagation in all cases. Also, ignore the event if the
// element is already at the top or bottom. Otherwise we get a
// new scroll event on the parent (?).
$('.modal-body, .scrolling_list, input, textarea').mousewheel(function (e, delta) {
var self = $(this);
var scroll = self.scrollTop();
e.stopPropagation();