From c3cb9a6246aafffbe3e20ca4fd0bcf2bbf72c662 Mon Sep 17 00:00:00 2001
From: Waseem Daher <wdaher@humbughq.com>
Date: Tue, 12 Feb 2013 10:31:55 -0500
Subject: [PATCH] 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)
---
 templates/zephyr/index.html |  5 ++---
 zephyr/static/js/ui.js      | 11 ++++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/templates/zephyr/index.html b/templates/zephyr/index.html
index 2147d1080b..145d5b08de 100644
--- a/templates/zephyr/index.html
+++ b/templates/zephyr/index.html
@@ -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>
diff --git a/zephyr/static/js/ui.js b/zephyr/static/js/ui.js
index 789dab698b..836717af43 100644
--- a/zephyr/static/js/ui.js
+++ b/zephyr/static/js/ui.js
@@ -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();