Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Show confirmation dialog on leaving WebUI while composing #5616

Merged
merged 2 commits into from
Nov 9, 2017
Merged

Show confirmation dialog on leaving WebUI while composing #5616

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a0af46a
Show confirmation dialog on leaving WebUI while composing
unarist Nov 7, 2017
514ca00
Fix message and comments
unarist Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions app/javascript/mastodon/features/ui/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@ import {
} from './util/async-components';
import { HotKeys } from 'react-hotkeys';
import { me } from '../../initial_state';
import { defineMessages, injectIntl } from 'react-intl';

// Dummy import, to make sure that <Status /> ends up in the application bundle.
// Without this it ends up in ~8 very commonly used bundles.
import '../../components/status';

const messages = defineMessages({
beforeUnload: { id: 'ui.beforeunload', defaultMessage: 'Your draft will be lost if you leave Mastodon.' },
});

const mapStateToProps = state => ({
isComposing: state.getIn(['compose', 'is_composing']),
hasComposingText: state.getIn(['compose', 'text']) !== '',
});

const keyMap = {
Expand Down Expand Up @@ -75,6 +81,7 @@ const keyMap = {
};

@connect(mapStateToProps)
@injectIntl
@withRouter
export default class UI extends React.Component {

Expand All @@ -86,14 +93,27 @@ export default class UI extends React.Component {
dispatch: PropTypes.func.isRequired,
children: PropTypes.node,
isComposing: PropTypes.bool,
hasComposingText: PropTypes.bool,
location: PropTypes.object,
intl: PropTypes.object.isRequired,
};

state = {
width: window.innerWidth,
draggingOver: false,
};

handleBeforeUnload = (e) => {
const { intl, isComposing, hasComposingText } = this.props;

if (isComposing && hasComposingText) {
// Setting returnValue to any string causes confirmation dialog.
// Many browsers no longer display this text to users,
// but we set user-friendly message for other browsers, e.g. Edge.
e.returnValue = intl.formatMessage(messages.beforeUnload);
}
}

handleResize = debounce(() => {
// The cached heights are no longer accurate, invalidate
this.props.dispatch(clearHeight());
Expand Down Expand Up @@ -168,6 +188,7 @@ export default class UI extends React.Component {
}

componentWillMount () {
window.addEventListener('beforeunload', this.handleBeforeUnload, false);
window.addEventListener('resize', this.handleResize, { passive: true });
document.addEventListener('dragenter', this.handleDragEnter, false);
document.addEventListener('dragover', this.handleDragOver, false);
Expand Down Expand Up @@ -209,6 +230,7 @@ export default class UI extends React.Component {
}

componentWillUnmount () {
window.removeEventListener('beforeunload', this.handleBeforeUnload);
window.removeEventListener('resize', this.handleResize);
document.removeEventListener('dragenter', this.handleDragEnter);
document.removeEventListener('dragover', this.handleDragOver);
Expand Down