summaryrefslogtreecommitdiffstats
path: root/web/react/components/post_list.jsx
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2015-07-09 15:26:20 -0400
committerJoram Wilander <jwawilander@gmail.com>2015-07-09 15:26:20 -0400
commit763618ef3613d0af6baea0e1d49abb6641979841 (patch)
treed50327f0fb054224dcc9cc61b9b54df067b6e34e /web/react/components/post_list.jsx
parentb6fb6ea3be059d3c54027267760ccca0f95535ee (diff)
parent23c40243a4291bac573ccc05d45ad025b9570f62 (diff)
downloadchat-763618ef3613d0af6baea0e1d49abb6641979841.tar.gz
chat-763618ef3613d0af6baea0e1d49abb6641979841.tar.bz2
chat-763618ef3613d0af6baea0e1d49abb6641979841.zip
Merge pull request #151 from asaadmahmoodspin/master
MM-1469 - Loading message in more channel modal
Diffstat (limited to 'web/react/components/post_list.jsx')
-rw-r--r--web/react/components/post_list.jsx13
1 files changed, 12 insertions, 1 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx
index fc5157ce6..d6dc9ce30 100644
--- a/web/react/components/post_list.jsx
+++ b/web/react/components/post_list.jsx
@@ -123,7 +123,7 @@ module.exports = React.createClass({
$('.post-list__content div .post').removeClass('post--last');
$('.post-list__content div:last-child .post').addClass('post--last');
- $('body').on('mouseenter mouseleave', '.post:not(.post--comment.same--root)', function(ev){
+ $('body').on('mouseenter mouseleave', '.post', function(ev){
if(ev.type === 'mouseenter'){
$(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--after');
$(this).parent('div').next('.date-separator, .new-separator').addClass('hovered--before');
@@ -134,6 +134,17 @@ module.exports = React.createClass({
}
});
+ $('body').on('mouseenter mouseleave', '.post.post--comment.same--root', function(ev){
+ if(ev.type === 'mouseenter'){
+ $(this).parent('div').prev('.date-separator, .new-separator').addClass('hovered--comment');
+ $(this).parent('div').next('.date-separator, .new-separator').addClass('hovered--comment');
+ }
+ else {
+ $(this).parent('div').prev('.date-separator, .new-separator').removeClass('hovered--comment');
+ $(this).parent('div').next('.date-separator, .new-separator').removeClass('hovered--comment');
+ }
+ });
+
},
componentDidUpdate: function() {
this.resize();