Don't warn about unsaved changes when deleting a scratch paper

64json · 64json · commit 0ee06293494f · 2018-08-11T22:48:33.000+09:00
diff --git a/src/frontend/components/App/index.jsx b/src/frontend/components/App/index.jsx
@@ -123,8 +123,8 @@ class App extends React.Component {
       .catch(this.props.showErrorToast);
   }
 
-  loadAlgorithm({ categoryKey, algorithmKey, gistId }) {
-    if (!this.isGistSaved() && !window.confirm('Are you sure want to discard changes?')) return;
+  loadAlgorithm({ categoryKey, algorithmKey, gistId }, forceLoad = false) {
+    if (!forceLoad && !this.isGistSaved() && !window.confirm('Are you sure want to discard changes?')) return;
 
     const { ext } = this.props.env;
     let fetchPromise = null;
@@ -249,12 +249,12 @@ class App extends React.Component {
         </Helmet>
         <Header className={styles.header} onClickTitleBar={() => this.toggleNavigatorOpened()}
                 navigatorOpened={navigatorOpened} loadScratchPapers={() => this.loadScratchPapers()}
-                loadAlgorithm={params => this.loadAlgorithm(params)} gistSaved={gistSaved}
+                loadAlgorithm={this.loadAlgorithm.bind(this)} gistSaved={gistSaved}
                 file={file} />
         <ResizableContainer className={styles.workspace} horizontal weights={workspaceWeights}
                             visibles={[navigatorOpened, true, true]}
                             onChangeWeights={weights => this.handleChangeWorkspaceWeights(weights)}>
-          <Navigator loadAlgorithm={params => this.loadAlgorithm(params)} />
+          <Navigator loadAlgorithm={this.loadAlgorithm.bind(this)} />
           <VisualizationViewer className={styles.visualization_viewer} />
           <TabContainer className={styles.editor_tab_container} titles={editorTitles} tabIndex={editorTabIndex}
                         onChangeTabIndex={tabIndex => this.handleChangeEditorTabIndex(tabIndex)}>
diff --git a/src/frontend/components/Header/index.jsx b/src/frontend/components/Header/index.jsx
@@ -69,7 +69,7 @@ class Header extends React.Component {
     const { gistId } = this.props.current;
     const deletePromise = gistId === 'new' ? Promise.resolve() : GitHubApi.deleteGist(gistId);
     deletePromise
-      .then(() => this.props.loadAlgorithm({}))
+      .then(() => this.props.loadAlgorithm({}, true))
       .then(this.props.loadScratchPapers)
       .catch(this.props.showErrorToast);
   }

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ class Header extends React.Component {`
`69`	`69`	`const { gistId } = this.props.current;`
`70`	`70`	`const deletePromise = gistId === 'new' ? Promise.resolve() : GitHubApi.deleteGist(gistId);`
`71`	`71`	`deletePromise`
`72`		`- .then(() => this.props.loadAlgorithm({}))`
	`72`	`+ .then(() => this.props.loadAlgorithm({}, true))`
`73`	`73`	`.then(this.props.loadScratchPapers)`
`74`	`74`	`.catch(this.props.showErrorToast);`
`75`	`75`	`}`