Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
This commit is contained in:
commit
10f800ab46
2 changed files with 6 additions and 5 deletions
|
@ -27,8 +27,6 @@ const componentMap = {
|
|||
'LIST': ListTimeline,
|
||||
};
|
||||
|
||||
const isRtlLayout = document.getElementsByTagName('body')[0].classList.contains('rtl');
|
||||
|
||||
@component => injectIntl(component, { withRef: true })
|
||||
export default class ColumnsArea extends ImmutablePureComponent {
|
||||
|
||||
|
@ -55,7 +53,10 @@ export default class ColumnsArea extends ImmutablePureComponent {
|
|||
if (!this.props.singleColumn) {
|
||||
this.node.addEventListener('wheel', this.handleWheel, detectPassiveEvents.hasSupport ? { passive: true } : false);
|
||||
}
|
||||
|
||||
this.lastIndex = getIndex(this.context.router.history.location.pathname);
|
||||
this.isRtlLayout = document.getElementsByTagName('body')[0].classList.contains('rtl');
|
||||
|
||||
this.setState({ shouldAnimate: true });
|
||||
}
|
||||
|
||||
|
@ -81,7 +82,7 @@ export default class ColumnsArea extends ImmutablePureComponent {
|
|||
|
||||
handleChildrenContentChange() {
|
||||
if (!this.props.singleColumn) {
|
||||
const modifier = isRtlLayout ? -1 : 1;
|
||||
const modifier = this.isRtlLayout ? -1 : 1;
|
||||
this._interruptScrollAnimation = scrollRight(this.node, (this.node.scrollWidth - window.innerWidth) * modifier);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,7 +17,7 @@ module Mastodon
|
|||
end
|
||||
|
||||
def pre
|
||||
'rc4'
|
||||
'rc5'
|
||||
end
|
||||
|
||||
def flags
|
||||
|
|
Loading…
Reference in a new issue