Merge pull request #243 from parallaxinc/user-config-fixes

update user config module and make sure saving is waited on

Author: 2fast2fourier

client.js

@@ -77,8 +77,9 @@ function onRender(err){
 
   // Finish Loading Plugin
   // TODO: encapsulate into a startup handler?
-  const cwd = userConfig.get('cwd') || defaultProject;
-  const lastFile = userConfig.get('last-file');
+  const config = userConfig.getState();
+  const cwd = config.cwd || defaultProject;
+  const lastFile = config['last-file'];
   console.log(cwd, lastFile);
   changeProject(cwd)
     .then(() => {

package.json

@@ -7,7 +7,7 @@
     "test": "test"
   },
   "dependencies": {
-    "@phated/redux-create-store": "^0.1.1",
+    "@phated/redux-create-store": "^0.3.0",
     "bs2-serial": "^0.11.0",
     "codemirror": "^4.13.0",
     "frylord": "^0.7.1",
@@ -21,7 +21,7 @@
     "react-mfb-iceddev": "^0.1.0",
     "react-style": "^0.4.0",
     "skrim": "0.0.3",
-    "snacks": "^0.2.0",
+    "snacks": "^0.3.0",
     "sovereign": "^0.3.0",
     "when": "^3.7.2"
   },

src/plugins/handlers.js

@@ -74,12 +74,12 @@ function handlers(app, opts, done){
 
     const builtName = `untitled${untitledLast + 1}`;
 
-    workspace.newFile(builtName, '');
-
-    userConfig.set('last-file', builtName);
-
-    documents.create(path.join(cwd, builtName), '');
-    documents.focus();
+    workspace.newFile(builtName, '')
+      .then(() => userConfig.set('last-file', builtName))
+      .then(function(){
+        documents.create(path.join(cwd, builtName), '');
+        documents.focus();
+      });
   }
 
   function saveFile(){
@@ -165,10 +165,9 @@ function handlers(app, opts, done){
 
     // TODO: handle error
     workspace.changeFile(filename)
+      .then(() => userConfig.set('last-file', filename))
       .then(() => {
         const { content } = workspace.getState();
-        userConfig.set('last-file', filename);
-
         documents.create(path.join(cwd, filename), content);
         documents.focus();
       });
@@ -183,10 +182,8 @@ function handlers(app, opts, done){
     const dirpath = path.join('/', projectName);
 
     return workspace.changeDirectory(dirpath)
-      .then(() => {
-        userConfig.set('cwd', dirpath);
-        userConfig.set('last-file', '');
-      });
+      .then(() => userConfig.set('cwd', dirpath))
+      .then(() => userConfig.unset('last-file'));
   }
 
   function deleteProject(projectName){