Merge pull request #244 from parallaxinc/new-file-save-as

New file save as

Author: 2fast2fourier

.eslintrc

@@ -1,18 +1,4 @@
 {
-  "ecmaFeatures": {
-    "jsx": true
-  },
-  "rules": {
-    "semi": [2, "always"],
-    "quotes": [2, "single"],
-    "strict": [2, "global"],
-    "no-underscore-dangle": 0
-  },
-  "plugins": ["react"],
-  "env": {
-    "es6": true,
-    "browser": true,
-    "node": true
-  }
+  "extends": "@phated/iceddev"
 }
 

package.json

@@ -26,6 +26,7 @@
     "when": "^3.7.2"
   },
   "devDependencies": {
+    "@phated/eslint-config-iceddev": "^0.2.1",
     "babel-core": "^4.5.1",
     "babel-loader": "^4.0.0",
     "babel-runtime": "^4.7.16",
@@ -34,8 +35,9 @@
     "css-loader": "^0.9.1",
     "del": "^1.1.1",
     "electron-prebuilt": "^0.30.2",
-    "eslint": "^0.24.0",
-    "eslint-plugin-react": "^2.6.3",
+    "eslint": "^1.2.1",
+    "eslint-plugin-mocha": "^0.5.1",
+    "eslint-plugin-react": "^3.2.3",
     "expect": "^1.8.0",
     "gulp": "git://github.com/gulpjs/gulp#4.0",
     "gulp-util": "^3.0.4",

src/constants/action-types.js

@@ -23,8 +23,9 @@ const actionTypes = {
   UPDATE_SELECTED_DEVICE: 'UPDATE_SELECTED_DEVICE',
   RESET_DOWNLOAD_PROGRESS: 'RESET_DOWNLOAD_PROGRESS',
   UPDATE_DOWNLOAD_PROGRESS: 'UPDATE_DOWNLOAD_PROGRESS',
-  RESET_FILE_QUEUE: 'RESET_FILE_QUEUE',
-  QUEUE_FILE_CHANGE: 'QUEUE_FILE_CHANGE'
+  QUEUE_NEW_FILE: 'QUEUE_NEW_FILE',
+  QUEUE_CHANGE_FILE: 'QUEUE_CHANGE_FILE',
+  RESET_ACTION_QUEUE: 'RESET_ACTION_QUEUE'
 };
 
 module.exports = actionTypes;

src/constants/queued-action-types.js

@@ -0,0 +1,8 @@
+'use strict';
+
+const queuedActionTypes = {
+  NEW_FILE: 'NEW_FILE',
+  CHANGE_FILE: 'CHANGE_FILE'
+};
+
+module.exports = queuedActionTypes;

src/creators/index.js

@@ -30,9 +30,10 @@ const creators = {
   updateSelectedDevice: require('./update-selected-device'),
   resetDownloadProgress: require('./reset-download-progress'),
   updateDownloadProgress: require('./update-download-progress'),
-  // file creators
-  resetFileQueue: require('./reset-file-queue'),
-  queueFileChange: require('./queue-file-change')
+  // action queue creators
+  queueNewFile: require('./queue-new-file'),
+  queueChangeFile: require('./queue-change-file'),
+  resetActionQueue: require('./reset-action-queue')
 };
 
 module.exports = creators;

src/creators/queue-file-change.js src/creators/queue-change-file.jssrc/creators/queue-file-change.js renamed to src/creators/queue-change-file.js

@@ -1,16 +1,16 @@
 'use strict';
 
 const {
-  QUEUE_FILE_CHANGE
+  QUEUE_CHANGE_FILE
 } = require('../constants/action-types');
 
-function queueFileChange(filename){
+function queueChangeFile(filename){
   return {
-    type: QUEUE_FILE_CHANGE,
+    type: QUEUE_CHANGE_FILE,
     payload: {
       filename
     }
   };
 }
 
-module.exports = queueFileChange;
+module.exports = queueChangeFile;

src/creators/queue-new-file.js

@@ -0,0 +1,14 @@
+'use strict';
+
+const {
+  QUEUE_NEW_FILE
+} = require('../constants/action-types');
+
+function queueNewFile(){
+  return {
+    type: QUEUE_NEW_FILE,
+    payload: {}
+  };
+}
+
+module.exports = queueNewFile;

src/creators/reset-file-queue.js src/creators/reset-action-queue.jssrc/creators/reset-file-queue.js renamed to src/creators/reset-action-queue.js

@@ -1,12 +1,12 @@
 'use strict';
 
 const {
-  RESET_FILE_QUEUE
+  RESET_ACTION_QUEUE
 } = require('../constants/action-types');
 
 function resetFileQueue(){
   return {
-    type: RESET_FILE_QUEUE,
+    type: RESET_ACTION_QUEUE,
     payload: {}
   };
 }

src/plugins/handlers.js

@@ -13,6 +13,11 @@ const Terminal = require('../lib/terminal');
 const Documents = require('../lib/documents');
 const highlighter = require('../lib/highlighter');
 
+const {
+  NEW_FILE,
+  CHANGE_FILE
+} = require('../constants/queued-action-types');
+
 // TODO: move somewhere else?
 const red = '#da2100';
 const green = '#159600';
@@ -56,8 +61,21 @@ function handlers(app, opts, done){
     userConfig
   } = app;
 
+  function handleActionQueue(){
+    const { nextAction, nextFile } = store.getState();
+
+    store.dispatch(creators.resetActionQueue());
+
+    switch(nextAction){
+      case NEW_FILE:
+        return newFile();
+      case CHANGE_FILE:
+        return changeFile(nextFile);
+    }
+  }
+
   function newFile(){
-    const { cwd, directory } = workspace.getState();
+    const { cwd, directory, isNew, content } = workspace.getState();
 
     // TODO: utility function
     const untitledNums = _.reduce(directory, function(untitled, dirfile) {
@@ -74,6 +92,13 @@ function handlers(app, opts, done){
 
     const builtName = `untitled${untitledLast + 1}`;
 
+    // TODO: DRY this up
+    if(isNew && _.trim(content).length){
+      store.dispatch(creators.queueNewFile());
+      showSaveOverlay();
+      return;
+    }
+
     workspace.newFile(builtName, '')
       .then(() => userConfig.set('last-file', builtName))
       .then(function(){
@@ -100,30 +125,22 @@ function handlers(app, opts, done){
       return;
     }
 
-    const { nextFile } = store.getState();
     const { cwd, content } = workspace.getState();
 
     workspace.updateFilename(filename)
-      .then(function(){
-        return workspace.saveFile(filename, content);
-      })
+      .then(() => workspace.saveFile(filename, content))
       .then(function(){
         documents.swap(path.join(cwd, filename));
-        if(nextFile){
-          changeFile(nextFile);
-        }
+        handleActionQueue();
       });
   }
 
   function dontSaveFile(){
     const { nextFile } = store.getState();
 
+    // TODO: handle error
     workspace.resetFile()
-      .then(function(){
-        if(nextFile){
-          changeFile(nextFile);
-        }
-      });
+      .then(handleActionQueue);
   }
 
   function deleteFile(filename){
@@ -147,19 +164,20 @@ function handlers(app, opts, done){
       cwd
     } = workspace.getState();
 
-    store.dispatch(creators.resetFileQueue());
-
+    // TODO: DRY this up
     if(isNew && _.trim(content).length){
-      store.dispatch(creators.queueFileChange(filename));
+      store.dispatch(creators.queueChangeFile(filename));
       showSaveOverlay();
       return;
     }
 
     const doc = documents.swap(path.join(cwd, filename));
     if(doc){
-      workspace.updateFilename(filename);
-      workspace.updateContent(doc.getValue());
-      documents.focus();
+      workspace.changeFile(filename)
+        .then(() => workspace.updateContent(doc.getValue()))
+        .then(function(){
+          documents.focus();
+        });
       return;
     }
 

src/reducers/index.js

@@ -7,7 +7,8 @@ const reducers = {
   device: require('./device'),
   deviceList: require('./device-list'),
   downloadProgress: require('./download-progress'),
-  nextFile: require('./next-file')
+  nextFile: require('./next-file'),
+  nextAction: require('./next-action')
 };
 
 module.exports = reducers;