From d151d430179a6ddf1cfec1261bc6b134dd3aab9e Mon Sep 17 00:00:00 2001
From: Asaad Mahmood <Unknowngi@live.com>
Date: Wed, 5 Aug 2015 15:56:08 +0500
Subject: Fixing mentions scroll again due to merge conflict

---
 web/react/components/mention_list.jsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index a0f68df98..16c1994e1 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -20,6 +20,13 @@ module.exports = React.createClass({
         PostStore.addMentionDataChangeListener(this.onListenerChange);
         var self = this;
 
+        $('.post-right__scroll').scroll(function(){
+            console.log('sad');
+            if($('.mentions--top').length){
+                $('#reply_mention_tab .mentions--top').css({ bottom: $(window).height() - $('.post-right__scroll #reply_textbox').offset().top });
+            }
+        });
+
         $('body').on('keydown.mentionlist', '#' + this.props.id,
             function(e) {
                 if (!self.isEmpty() && self.state.mentionText !== '-1' && (e.which === 13 || e.which === 9)) {
-- 
cgit v1.2.3-1-g7c22