diff options
author | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 07:55:21 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2015-08-18 07:55:21 -0400 |
commit | ab197e98358f4f48b81669182a361b6641132029 (patch) | |
tree | 0b12894cfd4f9f198021e4441adbf22814885e26 /web/react/components | |
parent | 5f7be5c1d3c3cf2aec60c90c9ff9e2b1f0f81f1b (diff) | |
parent | 602bcc4f3881faefeca65c6b8f66db2cff64e152 (diff) | |
download | chat-ab197e98358f4f48b81669182a361b6641132029.tar.gz chat-ab197e98358f4f48b81669182a361b6641132029.tar.bz2 chat-ab197e98358f4f48b81669182a361b6641132029.zip |
Merge pull request #352 from nickago/MM-1092
Mm 1092 Renders scrolling in firefox every time for the more channels modal
Diffstat (limited to 'web/react/components')
-rw-r--r-- | web/react/components/post.jsx | 6 | ||||
-rw-r--r-- | web/react/components/post_list.jsx | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx index e72a2d001..f099c67ab 100644 --- a/web/react/components/post.jsx +++ b/web/react/components/post.jsx @@ -11,12 +11,6 @@ var ActionTypes = Constants.ActionTypes; module.exports = React.createClass({ displayName: "Post", - componentDidMount: function() { - $('.modal').on('show.bs.modal', function () { - $('.modal-body').css('overflow-y', 'auto'); - $('.modal-body').css('max-height', $(window).height() * 0.7); - }); - }, handleCommentClick: function(e) { e.preventDefault(); diff --git a/web/react/components/post_list.jsx b/web/react/components/post_list.jsx index 83f806b79..fa74d4295 100644 --- a/web/react/components/post_list.jsx +++ b/web/react/components/post_list.jsx @@ -69,6 +69,12 @@ module.exports = React.createClass({ this.oldScrollHeight = post_holder.scrollHeight; this.oldZoom = (window.outerWidth - 8) / window.innerWidth; + $('.modal').on('show.bs.modal', function () { + $('.modal-body').css('overflow-y', 'auto'); + $('.modal-body').css('max-height', $(window).height() * 0.7); + }); + + // Timeout exists for the DOM to fully render before making changes var self = this; $(window).resize(function(){ $(post_holder).perfectScrollbar('update'); @@ -140,6 +146,7 @@ module.exports = React.createClass({ UserStore.removeStatusesChangeListener(this._onTimeChange); SocketStore.removeChangeListener(this._onSocketChange); $('body').off('click.userpopover'); + $('.modal').off('show.bs.modal') }, resize: function() { var post_holder = $(".post-list-holder-by-time")[0]; |