diff options
author | Stas Vovk <stas@vovk.me> | 2015-10-12 21:54:51 +0300 |
---|---|---|
committer | Stas Vovk <stas@vovk.me> | 2015-10-12 21:54:51 +0300 |
commit | bafb341015e6a9aaba878bec8126fcc825531015 (patch) | |
tree | 1312efa11b3435205d2d31818a0f2ce91269373c /web/react/components/channel_loader.jsx | |
parent | b5a499977ec212139444974255a27f8e66d0befd (diff) | |
parent | 246d934e5e557555645a1d26ae005be452ecbd2d (diff) | |
download | chat-bafb341015e6a9aaba878bec8126fcc825531015.tar.gz chat-bafb341015e6a9aaba878bec8126fcc825531015.tar.bz2 chat-bafb341015e6a9aaba878bec8126fcc825531015.zip |
Merge remote-tracking branch 'upstream/master' into PLT-589
Diffstat (limited to 'web/react/components/channel_loader.jsx')
-rw-r--r-- | web/react/components/channel_loader.jsx | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/web/react/components/channel_loader.jsx b/web/react/components/channel_loader.jsx index d16069725..d0d6ab5e2 100644 --- a/web/react/components/channel_loader.jsx +++ b/web/react/components/channel_loader.jsx @@ -104,12 +104,6 @@ export default class ChannelLoader extends React.Component { } }); - /* Setup modal events */ - $('.modal').on('show.bs.modal', function onShow() { - $('.modal-body').css('overflow-y', 'auto'); - $('.modal-body').css('max-height', $(window).height() * 0.7); - }); - /* Prevent backspace from navigating back a page */ $(window).on('keydown.preventBackspace', (e) => { if (e.which === 8 && !$(e.target).is('input, textarea')) { |