Fixup the config file usage

diff --git a/frontend/js/app.js b/frontend/js/app.js
index e9d469be99d400656e7107259265c8f2503ece1d..6303a892984868c4d496b92efe04c556033e0028 100644 (file)
--- a/frontend/js/app.js
+++ b/frontend/js/app.js
@@ -35,7 +35,13 @@ function getProfile(accessToken, callback) {
         app.session.username = result.body.username;
         app.session.valid = true;
 
-        callback();
+        superagent.get('/api/settings').query({ access_token: localStorage.accessToken }).end(function (error, result) {
+            if (error) console.error(error);
+
+            app.folderListingEnabled = !!result.body.folderListingEnabled;
+
+            callback();
+        });
     });
 }
 
@@ -339,12 +345,6 @@ getProfile(localStorage.accessToken, function (error) {
     if (error) return console.error(error);
 
     loadDirectory(window.location.hash.slice(1));
-
-    superagent.get('/api/settings').query({ access_token: localStorage.accessToken }).end(function (error, result) {
-        if (error) console.error(error);
-
-        app.folderListingEnabled = !!result.body.folderListingEnabled;
-    });
 });
 
 $(window).on('hashchange', function () {

diff --git a/server.js b/server.js
index 4a8bfe5af89ef9d6a469192b6c3cfb653476874a..60c1bddcd0598f95722c5bed3794e009f9d65c3a 100755 (executable)
--- a/server.js
+++ b/server.js
@@ -23,7 +23,7 @@ var express = require('express'),
 
 
 var rootFolder = path.resolve(__dirname, process.argv[2] || 'files');
-var configFile = path.resolve(__dirname, process.argv[3] || './config.json');
+var configFile = path.resolve(__dirname, process.argv[3] || '.config.json');
 
 // Ensure the root folder exists
 mkdirp.sync(rootFolder);