browseSkin is now --skin

nicola · nicola · commit f5b67edba3af · 2015-08-18T19:22:41.000+02:00
diff --git a/bin/ldnode.js b/bin/ldnode.js
@@ -93,6 +93,9 @@ var argv = require('nomnom')
     full: 'error-pages',
     help: 'Folder from which to look for custom error pages files (files must be named <error-code>.html -- eg. 500.html)'
   })
+  .option('skin', {
+    help: 'Path to a skin to load (default: https://linkeddata.github.io/warp/#/list/)'
+  })
   .parse();
 
 // Print version and leave
diff --git a/lib/handlers/get.js b/lib/handlers/get.js
@@ -21,9 +21,6 @@ var HttpError = require('../http-error');
 var ldpVocab = require('../vocab/ldp.js');
 var turtleExtension = '.ttl';
 
-// this should be moved to options
-var browseSkin = 'https://linkeddata.github.io/warp/#/list/';
-
 function get(req, res, next, includeBody) {
     var ldp = req.app.locals.ldp;
     var uri = utils.uriBase(req);
@@ -101,8 +98,10 @@ function get(req, res, next, includeBody) {
         }
 
         // redirect to file browser if we got text/html with highest priority
-        if (container && res.acceptTypes.indexOf('text/html') === 0) {
-            return res.redirect(303, browseSkin + req.protocol + '/' + req.get('host') + req.originalUrl);
+        if (container &&
+            res.acceptTypes.indexOf('text/html') === 0 &&
+            ldp.skin) {
+            return res.redirect(303, ldp.skin + req.protocol + '/' + req.get('host') + req.originalUrl);
         }
 
         // TODO this should be added as a middleware in the routes
diff --git a/lib/ldp.js b/lib/ldp.js
@@ -75,6 +75,12 @@ function LDP(argv) {
   }
   ldp.errorHandler = argv.errorHandler;
 
+  // argv.skin is false when --no-skin is passed
+  if (argv.skin !== false) {
+    ldp.skin = argv.skin || 'https://linkeddata.github.io/warp/#/list/';
+  }
+  console.log(argv)
+
   debug.settings("mount: " + ldp.mount);
   debug.settings("root: " + ldp.root);
   debug.settings("URI path filter regexp: " + ldp.pathFilter);
