From 9fc7ad7b9ce663a9daff9fdd4d934c101f6e38c0 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Tue, 29 May 2018 16:40:04 +0200
Subject: [Glitch] Always display tab navigation on local/federated timeline
even when empty
Port 90b64c006998ec3bae365007781c61e8a79eeeef to glitch-soc
---
app/javascript/flavours/glitch/components/status_list.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'app/javascript/flavours/glitch/components')
diff --git a/app/javascript/flavours/glitch/components/status_list.js b/app/javascript/flavours/glitch/components/status_list.js
index 5249af76d..a7629bd54 100644
--- a/app/javascript/flavours/glitch/components/status_list.js
+++ b/app/javascript/flavours/glitch/components/status_list.js
@@ -25,7 +25,7 @@ export default class StatusList extends ImmutablePureComponent {
prepend: PropTypes.node,
alwaysPrepend: PropTypes.bool,
emptyMessage: PropTypes.node,
- timelineId: PropTypes.string,
+ timelineId: PropTypes.string.isRequired,
};
static defaultProps = {
--
cgit
From 5eaf2c9e027f1f6ef4e783e726ab7fcbc769a881 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 19 Dec 2018 13:13:24 +0100
Subject: [Glitch] Back to the getting-started when pins the timeline
Port 5bf100f87be571e86305f3ab244183fc46f1ede2 to glitch-soc
---
.../flavours/glitch/components/column_header.js | 29 +++++++++++++++-------
1 file changed, 20 insertions(+), 9 deletions(-)
(limited to 'app/javascript/flavours/glitch/components')
diff --git a/app/javascript/flavours/glitch/components/column_header.js b/app/javascript/flavours/glitch/components/column_header.js
index 72207637d..87e848a59 100644
--- a/app/javascript/flavours/glitch/components/column_header.js
+++ b/app/javascript/flavours/glitch/components/column_header.js
@@ -47,6 +47,15 @@ export default class ColumnHeader extends React.PureComponent {
animatingNCD: false,
};
+ historyBack = () => {
+ // if history is exhausted, or we would leave mastodon, just go to root.
+ if (window.history.state) {
+ this.context.router.history.goBack();
+ } else {
+ this.context.router.history.push('/');
+ }
+ }
+
handleToggleClick = (e) => {
e.stopPropagation();
this.setState({ collapsed: !this.state.collapsed, animating: true });
@@ -65,12 +74,7 @@ export default class ColumnHeader extends React.PureComponent {
}
handleBackClick = () => {
- // if history is exhausted, or we would leave mastodon, just go to root.
- if (window.history.state) {
- this.context.router.history.goBack();
- } else {
- this.context.router.history.push('/');
- }
+ this.historyBack();
}
handleTransitionEnd = () => {
@@ -81,13 +85,20 @@ export default class ColumnHeader extends React.PureComponent {
this.setState({ animatingNCD: false });
}
+ handlePin = () => {
+ if (!this.props.pinned) {
+ this.historyBack();
+ }
+ this.props.onPin();
+ }
+
onEnterCleaningMode = () => {
this.setState({ animatingNCD: true });
this.props.onEnterCleaningMode(!this.props.notifCleaningActive);
}
render () {
- const { intl, icon, active, children, pinned, onPin, multiColumn, extraButton, showBackButton, intl: { formatMessage }, notifCleaning, notifCleaningActive } = this.props;
+ const { intl, icon, active, children, pinned, multiColumn, extraButton, showBackButton, intl: { formatMessage }, notifCleaning, notifCleaningActive } = this.props;
const { collapsed, animating, animatingNCD } = this.state;
let title = this.props.title;
@@ -132,7 +143,7 @@ export default class ColumnHeader extends React.PureComponent {
}
if (multiColumn && pinned) {
- pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-times' /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
+ pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><i className='fa fa fa-times' /> <FormattedMessage id='column_header.unpin' defaultMessage='Unpin' /></button>;
moveButtons = (
<div key='move-buttons' className='column-header__setting-arrows'>
@@ -141,7 +152,7 @@ export default class ColumnHeader extends React.PureComponent {
</div>
);
} else if (multiColumn) {
- pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={onPin}><i className='fa fa fa-plus' /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
+ pinButton = <button key='pin-button' className='text-btn column-header__setting-btn' onClick={this.handlePin}><i className='fa fa fa-plus' /> <FormattedMessage id='column_header.pin' defaultMessage='Pin' /></button>;
}
if (!pinned && (multiColumn || showBackButton)) {
--
cgit
From 1a3088364fe602bb48647d78dda440b174424e17 Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Fri, 21 Dec 2018 18:40:50 +0100
Subject: Fix composer not getting focus after reply confirmation dialog
The modal-handling code gives back focus to the element focused when the
modal opened. However, in the case of reply confirmation, it would do so
*after* the composer code itself requested focus.
---
app/javascript/flavours/glitch/components/modal_root.js | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'app/javascript/flavours/glitch/components')
diff --git a/app/javascript/flavours/glitch/components/modal_root.js b/app/javascript/flavours/glitch/components/modal_root.js
index cc26f6a11..7a90e6b8a 100644
--- a/app/javascript/flavours/glitch/components/modal_root.js
+++ b/app/javascript/flavours/glitch/components/modal_root.js
@@ -39,13 +39,15 @@ export default class ModalRoot extends React.PureComponent {
} else if (!nextProps.children) {
this.setState({ revealed: false });
}
+ if (!nextProps.children && !!this.props.children) {
+ this.activeElement.focus();
+ this.activeElement = null;
+ }
}
componentDidUpdate (prevProps) {
if (!this.props.children && !!prevProps.children) {
this.getSiblings().forEach(sibling => sibling.removeAttribute('inert'));
- this.activeElement.focus();
- this.activeElement = null;
this.handleModalClose();
}
if (this.props.children) {
--
cgit
From 22dedb676be608d226e098bfdc11c48c8715fdfa Mon Sep 17 00:00:00 2001
From: Thibaut Girka <thib@sitedethib.com>
Date: Sun, 23 Dec 2018 11:40:52 +0100
Subject: [Glitch] Fix unnecessary loadMore calls when the end of a timeline
has been reached
Port 8389b496ba9f8b5fa04a34ccc14c8e4195e03ea3 to glitch flavour
---
app/javascript/flavours/glitch/components/scrollable_list.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'app/javascript/flavours/glitch/components')
diff --git a/app/javascript/flavours/glitch/components/scrollable_list.js b/app/javascript/flavours/glitch/components/scrollable_list.js
index bd922462e..21d717b81 100644
--- a/app/javascript/flavours/glitch/components/scrollable_list.js
+++ b/app/javascript/flavours/glitch/components/scrollable_list.js
@@ -47,7 +47,7 @@ export default class ScrollableList extends PureComponent {
const { scrollTop, scrollHeight, clientHeight } = this.node;
const offset = scrollHeight - scrollTop - clientHeight;
- if (400 > offset && this.props.onLoadMore && !this.props.isLoading) {
+ if (400 > offset && this.props.onLoadMore && this.props.hasMore && !this.props.isLoading) {
this.props.onLoadMore();
}
--
cgit