diff options
author | nickago <ngonella@calpoly.edu> | 2015-07-13 07:23:28 -0700 |
---|---|---|
committer | nickago <ngonella@calpoly.edu> | 2015-07-13 07:23:45 -0700 |
commit | b63d42c2c6256ab5e904939a83d7e3eb530e101e (patch) | |
tree | 95a2df31e41aac20f90720608cf92d8cd0c64c67 /web/react/components/post_list.jsx | |
parent | 6cc8788193630b802375669c72fab02220cb692a (diff) | |
parent | b26bc73c7880e691e77e9ca4169e9ed7735e3bc9 (diff) | |
download | chat-b63d42c2c6256ab5e904939a83d7e3eb530e101e.tar.gz chat-b63d42c2c6256ab5e904939a83d7e3eb530e101e.tar.bz2 chat-b63d42c2c6256ab5e904939a83d7e3eb530e101e.zip |
merge conflicts
Diffstat (limited to 'web/react/components/post_list.jsx')
-rw-r--r-- | web/react/components/post_list.jsx | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index d6dc9ce30..59f33fb4d 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -63,6 +63,8 @@ module.exports = React.createClass({ oldScrollHeight: 0, oldZoom: 0, scrolledToNew: false, + p: 0, + wasForced: false, componentDidMount: function() { var user = UserStore.getCurrentUser(); if (user.props && user.props.theme) { @@ -107,6 +109,12 @@ module.exports = React.createClass({ }); $(post_holder).scroll(function(e){ + if (self.wasForced) { + console.log('hit'); + $(post_holder).scrollTop(self.p); + $(post_holder).perfectScrollbar('update'); + self.wasForced = false; + } if (!self.preventScrollTrigger) { self.scrollPosition = $(post_holder).scrollTop() + $(post_holder).innerHeight(); } @@ -193,6 +201,12 @@ module.exports = React.createClass({ this.scrolledToNew = false; } this.setState(newState); + } else { + // Updates the timestamp on each post + this.wasForced = true; + this.p = $(".post-list-holder-by-time").scrollTop(); + this.forceUpdate() + //this.refs.post0.refs.info.forceUpdate(); } }, _onSocketChange: function(msg) { @@ -447,7 +461,7 @@ module.exports = React.createClass({ isLastComment = (i === 0 || posts[order[i-1]].root_id != post.root_id); } - var postCtl = <Post sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />; + var postCtl = <Post ref={"post"+(order.length-i-1)}sameUser={sameUser} sameRoot={sameRoot} post={post} parentPost={parentPost} key={post.id} posts={posts} hideProfilePic={hideProfilePic} isLastComment={isLastComment} />; currentPostDay = utils.getDateForUnixTicks(post.create_at); if(currentPostDay.getDate() !== previousPostDay.getDate() || currentPostDay.getMonth() !== previousPostDay.getMonth() || currentPostDay.getFullYear() !== previousPostDay.getFullYear()) { |