handle overwrite cancel and remove overlay plugin

client.js

@@ -61,9 +61,6 @@ const plugins = [
   },
   {
     register: require('./src/plugins/notifications')
-  },
-  {
-    register: require('./src/plugins/overlays')
   }
 ];
 

src/creators/index.js

@@ -3,16 +3,6 @@
 const creators = {
   // overlay creators
   deleteProjectConfirm: require('./delete-project-confirm'),
-  showDeleteFileOverlay: require('./show-delete-file-overlay'),
-  showDeleteProjectOverlay: require('./show-delete-project-overlay'),
-  showDownloadOverlay: require('./show-download-overlay'),
-  showProjectsOverlay: require('./show-projects-overlay'),
-  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
   rxOn: require('./rx-on'),
   rxOff: require('./rx-off'),

src/plugins/handlers.js

@@ -14,6 +14,7 @@ const Terminal = require('../lib/terminal');
 const Documents = require('../lib/documents');
 const highlighter = require('../lib/highlighter');
 const directive = require('../lib/directive');
+const history = require('../lib/history');
 
 const {
   NEW_FILE,
@@ -125,7 +126,7 @@ function handlers(app, opts, done){
         .then(function(){
           documents.swap(path.join(cwd, filename));
         });
-      store.dispatch(creators.hideOverlay());
+      hideOverlay();
     }
   }
 
@@ -146,7 +147,7 @@ function handlers(app, opts, done){
         documents.replace(path.join(cwd, filename));
         handleActionQueue();
       });
-    store.dispatch(creators.hideOverlay());
+    hideOverlay();
   }
 
   function overwriteFile(){
@@ -170,6 +171,12 @@ function handlers(app, opts, done){
       });
   }
 
+  function cancelOverwriteFile(){
+    const { nextFile } = store.getState();
+    store.dispatch(creators.queueChangeFile(nextFile));
+    history.goBack();
+  }
+
   function dontSaveFile(){
     const { nextFile } = store.getState();
 
@@ -259,53 +266,53 @@ function handlers(app, opts, done){
 
   function deleteProjectConfirm(name){
     store.dispatch(creators.deleteProjectConfirm(name));
-    store.dispatch(creators.showDeleteProjectOverlay());
+    history.pushState({}, '/overlay/deleteproject');
   }
 
   function showHelpOverlay(){
-    store.dispatch(creators.showHelpOverlay());
+    history.pushState({}, '/overlay/help');
   }
 
   function showSaveOverlay(){
-    store.dispatch(creators.showSaveOverlay());
+    history.pushState({}, '/overlay/save');
   }
 
   function showSaveOnChangeOverlay(){
-    store.dispatch(creators.showSaveOnChangeOverlay());
+    history.pushState({}, '/overlay/save?showDontSaveButton=true');
   }
 
   function showOverwriteOverlay(name){
     store.dispatch(creators.queueOverwriteFile(name));
-    store.dispatch(creators.showOverwriteOverlay());
+    history.pushState({}, '/overlay/overwrite');
   }
 
   function showDownloadOverlay(){
-    store.dispatch(creators.showDownloadOverlay());
+    history.pushState({}, '/overlay/download');
     // TODO: is there ever a time when show download overlay doesn't reload devices?
     /* eslint no-use-before-define: false */
     reloadDevices();
   }
 
   function showProjectsOverlay(){
-    store.dispatch(creators.showProjectsOverlay());
+    history.pushState({}, '/overlay/project');
   }
 
   function showDeleteFileOverlay(){
-    store.dispatch(creators.showDeleteFileOverlay());
+    history.pushState({}, '/overlay/deletefile');
   }
 
   function showNewVersionOverlay(){
     chrome.storage.local.get('newVersion', function(val) {
       if(val.newVersion){
         chrome.storage.local.remove('newVersion', function() {
-          store.dispatch(creators.showNewVersionOverlay());
+          history.pushState({}, '/overlay/newversion');
         });
       }
     });
   }
 
   function hideOverlay(){
-    store.dispatch(creators.hideOverlay());
+    history.pushState({}, '/');
   }
 
   function findNext(){
@@ -707,6 +714,7 @@ function handlers(app, opts, done){
     changeFile,
     dontSaveFile,
     overwriteFile,
+    cancelOverwriteFile,
     // project methods
     changeProject,
     deleteProject,