summaryrefslogtreecommitdiffstats
path: root/web/react/components/mention_list.jsx
diff options
context:
space:
mode:
authorAsaad Mahmood <Unknowngi@live.com>2015-08-05 15:56:08 +0500
committerAsaad Mahmood <Unknowngi@live.com>2015-08-05 15:56:08 +0500
commitd151d430179a6ddf1cfec1261bc6b134dd3aab9e (patch)
tree5fc95fbd265f145f110abb9f71d634314c9896dc /web/react/components/mention_list.jsx
parent022317823e6c2b5a1787854d5531e7c32881b9a6 (diff)
downloadchat-d151d430179a6ddf1cfec1261bc6b134dd3aab9e.tar.gz
chat-d151d430179a6ddf1cfec1261bc6b134dd3aab9e.tar.bz2
chat-d151d430179a6ddf1cfec1261bc6b134dd3aab9e.zip
Fixing mentions scroll again due to merge conflict
Diffstat (limited to 'web/react/components/mention_list.jsx')
-rw-r--r--web/react/components/mention_list.jsx7
1 files changed, 7 insertions, 0 deletions
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)) {