Merge pull request #263 from parallaxinc/remove-dont-save-button-on-change-file

Hide the 'don't save' button when in change mode. closes #247

Author: phated

src/constants/overlay-states.js

@@ -9,6 +9,7 @@ const overlayStates = {
   OVERWRITE_OVERLAY: 'OVERWRITE_OVERLAY',
   NEW_VERSION_OVERLAY: 'NEW_VERSION_OVERLAY',
   DELETE_FILE_OVERLAY: 'DELETE_FILE_OVERLAY',
+  SAVE_ON_CHANGE_OVERLAY: 'SAVE_ON_CHANGE_OVERLAY',
   DELETE_PROJECT_OVERLAY: 'DELETE_PROJECT_OVERLAY'
 };
 

src/creators/index.js

@@ -10,6 +10,7 @@ const creators = {
   showOverwriteOverlay: require('./show-overwrite-overlay'),
   showNewVersionOverlay: require('./show-new-version-overlay'),
   showSaveOverlay: require('./show-save-overlay'),
+  showSaveOnChangeOverlay: require('./show-save-on-change-overlay'),
   showHelpOverlay: require('./show-help-overlay'),
   hideOverlay: require('./hide-overlay'),
   // terminal creators

src/creators/show-save-on-change-overlay.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const {
+  SHOW_OVERLAY
+} = require('../constants/action-types');
+
+const {
+  SAVE_ON_CHANGE_OVERLAY
+} = require('../constants/overlay-states');
+
+function showSaveOnChangeOverlay(){
+  return {
+    type: SHOW_OVERLAY,
+    payload: {
+      state: SAVE_ON_CHANGE_OVERLAY
+    }
+  };
+}
+
+module.exports = showSaveOnChangeOverlay;

src/plugins/handlers.js

@@ -185,7 +185,7 @@ function handlers(app, opts, done){
     // TODO: DRY this up
     if(isNew && _.trim(content).length){
       store.dispatch(creators.queueChangeFile(filename));
-      showSaveOverlay();
+      showSaveOnChangeOverlay();
       return;
     }
 
@@ -246,6 +246,10 @@ function handlers(app, opts, done){
     store.dispatch(creators.showSaveOverlay());
   }
 
+  function showSaveOnChangeOverlay(){
+    store.dispatch(creators.showSaveOnChangeOverlay());
+  }
+
   function showOverwriteOverlay(name){
     store.dispatch(creators.queueOverwriteFile(name));
     store.dispatch(creators.showOverwriteOverlay());
@@ -607,6 +611,7 @@ function handlers(app, opts, done){
     // overlay methods
     showHelpOverlay,
     showSaveOverlay,
+    showSaveOnChangeOverlay,
     showNewVersionOverlay,
     showDownloadOverlay,
     showProjectsOverlay,

src/plugins/overlays.js

@@ -22,6 +22,7 @@ const {
   OVERWRITE_OVERLAY,
   NEW_VERSION_OVERLAY,
   DELETE_FILE_OVERLAY,
+  SAVE_ON_CHANGE_OVERLAY,
   DELETE_PROJECT_OVERLAY
 } = require('../constants/overlay-states');
 
@@ -47,6 +48,9 @@ function overlays(app, opts, done){
       case SAVE_OVERLAY:
         renderOverlay(<SaveOverlay workspace={workspace} handlers={handlers} />);
         break;
+      case SAVE_ON_CHANGE_OVERLAY:
+        renderOverlay(<SaveOverlay workspace={workspace} handlers={handlers} showDontSaveButton={true} />);
+        break;
       case OVERWRITE_OVERLAY:
         renderOverlay(<OverwriteOverlay store={store} handlers={handlers} />);
         break;

src/views/save-overlay.js

@@ -102,11 +102,11 @@ class SaveOverlay extends React.Component {
   }
 
   render(){
-    const { isNew } = this.props;
+    const { isNew, showDontSaveButton } = this.props;
     const { filename } = this.state;
 
     let dontSaveButton;
-    if(isNew){
+    if(isNew && showDontSaveButton){
       dontSaveButton = (
         <Button onClick={this.dontSave}>Don't Save</Button>
       );