summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
authorAsaad Mahmood <asaadmahmoodspin@users.noreply.github.com>2016-05-03 16:50:18 +0500
committerJoram Wilander <jwawilander@gmail.com>2016-05-03 07:50:18 -0400
commit3a17fd86a0345b2410cf885bf4e862c6c3505745 (patch)
tree3b04bc1485c7fd823f83ffd656410b27761705e6 /webapp/components
parent2ae993125f0f79e182ac275083443a588621313a (diff)
downloadchat-3a17fd86a0345b2410cf885bf4e862c6c3505745.tar.gz
chat-3a17fd86a0345b2410cf885bf4e862c6c3505745.tar.bz2
chat-3a17fd86a0345b2410cf885bf4e862c6c3505745.zip
PLT-2758 - Removing sidebar animation (#2856)
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/sidebar_right.jsx19
1 files changed, 1 insertions, 18 deletions
diff --git a/webapp/components/sidebar_right.jsx b/webapp/components/sidebar_right.jsx
index 43b4a34bb..22ddfc205 100644
--- a/webapp/components/sidebar_right.jsx
+++ b/webapp/components/sidebar_right.jsx
@@ -2,7 +2,6 @@
// See License.txt for license information.
import $ from 'jquery';
-import velocity from 'velocity-animate';
import SearchResults from './search_results.jsx';
import RhsThread from './rhs_thread.jsx';
@@ -63,29 +62,13 @@ export default class SidebarRight extends React.Component {
doStrangeThings() {
// We should have a better way to do this stuff
// Hence the function name.
- var windowWidth = $(window).outerWidth();
- var sidebarRightWidth = $('.sidebar--right').outerWidth();
-
$('.app__body .inner-wrap').removeClass('.move--right');
$('.app__body .inner-wrap').addClass('move--left');
$('.app__body .sidebar--left').removeClass('move--right');
$('.app__body .sidebar--right').addClass('move--left');
//$('.sidebar--right').prepend('<div class="sidebar__overlay"></div>');
- if (this.state.searchVisible || this.state.postRightVisible) {
- if (windowWidth > 960) {
- velocity($('.app__body .inner-wrap'), {marginRight: sidebarRightWidth}, {duration: 500, easing: 'easeOutSine'});
- velocity($('.app__body .sidebar--right'), {translateX: 0}, {duration: 500, easing: 'easeOutSine'});
- } else {
- $('.app__body .inner-wrap, .sidebar--right').attr('style', '');
- }
- } else {
- if (windowWidth > 960) {
- velocity($('.app__body .inner-wrap'), {marginRight: 0}, {duration: 500, easing: 'easeOutSine'});
- velocity($('.app__body .sidebar--right'), {translateX: sidebarRightWidth}, {duration: 500, easing: 'easeOutSine'});
- } else {
- $('.app__body .inner-wrap, .sidebar--right').attr('style', '');
- }
+ if (!this.state.searchVisible && !this.state.postRightVisible) {
$('.app__body .inner-wrap').removeClass('move--left').removeClass('move--right');
$('.app__body .sidebar--right').removeClass('move--left');
return (