Skip to content

Commit decf4a9

Browse files
committed
[#1458] Fix merge bug, rename handler function
- Fix bug in warnIfUnsavedChanges that referred to this.props by changing it to props - Change function name from `warnIfUnsavedChangesCaller` to `handleUnsavedChanges`, remove it being called via binding/arrow func
1 parent e666b46 commit decf4a9

File tree

1 file changed

+5
-7
lines changed

1 file changed

+5
-7
lines changed

Diff for: client/modules/IDE/pages/IDEView.jsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ function warnIfUnsavedChanges(props) { // eslint-disable-line
5555
props.persistState();
5656
window.onbeforeunload = null;
5757
} else if (props.ide.unsavedChanges) {
58-
if (!window.confirm(this.props.t('WarningUnsavedChanges'))) {
58+
if (!window.confirm(props.t('WarningUnsavedChanges'))) {
5959
return false;
6060
}
6161
props.setUnsavedChanges(false);
@@ -90,9 +90,9 @@ class IDEView extends React.Component {
9090
this.isMac = navigator.userAgent.toLowerCase().indexOf('mac') !== -1;
9191
document.addEventListener('keydown', this.handleGlobalKeydown, false);
9292

93-
this.props.router.setRouteLeaveHook(this.props.route, () => warnIfUnsavedChanges(this.props));
93+
this.props.router.setRouteLeaveHook(this.props.route, this.handleUnsavedChanges);
9494

95-
window.onbeforeunload = () => warnIfUnsavedChanges();
95+
window.onbeforeunload = this.handleUnsavedChanges;
9696

9797
this.autosaveInterval = null;
9898
}
@@ -205,9 +205,7 @@ class IDEView extends React.Component {
205205
}
206206
}
207207

208-
warnIfUnsavedChangesCaller(props) {
209-
return warnIfUnsavedChanges(props);
210-
}
208+
handleUnsavedChanges = () => warnIfUnsavedChanges(this.props);
211209

212210
render() {
213211
return (
@@ -217,7 +215,7 @@ class IDEView extends React.Component {
217215
</Helmet>
218216
{this.props.toast.isVisible && <Toast />}
219217
<Nav
220-
warnIfUnsavedChanges={this.warnIfUnsavedChangesCaller.bind(this, this.props)}
218+
warnIfUnsavedChanges={this.handleUnsavedChanges}
221219
cmController={this.cmController}
222220
/>
223221
<Toolbar key={this.props.project.id} />

0 commit comments

Comments
 (0)