Merge pull request #48 from 0x6368/master

Fixed and improved scrolling using the arrow keys
stonesam92 · Aug 21, 2015 · 160d8bc · 160d8bc
2 parents 01ea99e + 606a633
commit 160d8bc
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/WhatsMac/inject.js b/WhatsMac/inject.js
@@ -77,8 +77,19 @@ function clickOnItemWithIndex (index, scrollToItem) {
                 var desiredItem = $this.get(0);
                 desiredItem.firstChild.click();
                 if (scrollToItem) {
-                    var scrollPos = offsetOfListItem($(desiredItem));
-                    $('.pane-list-body')[0].scrollTop = scrollPos;
+					$scrollView = $('.pane-list-body');
+					$desiredItem = $(desiredItem);
+
+					// Check whether the desired item is not inside the viewport (below)
+					if ($desiredItem.position().top + CHAT_ITEM_HEIGHT > $scrollView.scrollTop() + $scrollView.height()) {
+	                    var scrollPos = $desiredItem.position().top - $scrollView.height() + CHAT_ITEM_HEIGHT;
+	                    $scrollView.stop().animate({scrollTop: scrollPos}, 150);
+					}
+					// Check whether the desired item is not inside the viewport (above)
+					else if ($desiredItem.position().top < $scrollView.scrollTop()) {
+	                    var scrollPos = $desiredItem.position().top;
+	                    $scrollView.stop().animate({scrollTop: scrollPos}, 150);
+					}					
                 }
                 return false;
         }
@@ -128,6 +139,7 @@ jQuery(function () {
             var isInputFieldEmpty = $input.contents().length === 0 ||
                                     $input.contents()[0].nodeName === 'BR';
             if (direction && isInputFieldEmpty) {
+                event.preventDefault();
                 var $selectedItem = null;
                 var $infiniteListItems = $('.infinite-list-viewport .infinite-list-item');
                 $.each($infiniteListItems, function () {