Skip to content

Commit

Permalink
Whitespace
Browse files Browse the repository at this point in the history
  • Loading branch information
webpro committed Jun 19, 2016
1 parent 493aa6e commit 85a1c71
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
5 changes: 2 additions & 3 deletions bin/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ if(!program.highlightTheme && revealOptions.highlightTheme) {
highlightTheme = revealOptions.highlightTheme;
}

if (program.static) {
if(program.static) {
server.toStaticHTML({
basePath: basePath,
initialMarkdownPath: baseName,
Expand All @@ -130,11 +130,10 @@ if (program.static) {
printFile: program.print,
revealOptions: revealOptions,
openWebBrowser: !program.disableAutoOpen,
scripts: (program.scripts || '').split(',').map(function (script) {
scripts: (program.scripts || '').split(',').map(function(script) {
return script[0] === '/' ? script : path.resolve(process.cwd(), script);
})
});
}


// TODO: include make_static here!
17 changes: 8 additions & 9 deletions bin/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,13 @@ var fillOpts = function(options) {
opts.printMode = typeof options.printFile !== 'undefined' && options.printFile || opts.printMode;
opts.revealOptions = options.revealOptions || {};
opts.openWebBrowser = options.openWebBrowser;

opts.scripts = {};
options.scripts.forEach(function (script) {
opts.scripts[ path.basename(script) ] = script;
options.scripts.forEach(function(script) {
opts.scripts[path.basename(script)] = script;
});
};


var startMarkdownServer = function(options) {
var initialMarkdownPath = options.initialMarkdownPath;
var printFile = options.printFile;
Expand Down Expand Up @@ -107,8 +106,8 @@ var startMarkdownServer = function(options) {
});
} else {
console.log('Reveal-server started, opening at http://' + opts.host + ':' + opts.port);
if(opts.openWebBrowser){
open(initialFilePath);
if(opts.openWebBrowser) {
open(initialFilePath);
}
}
};
Expand Down Expand Up @@ -149,8 +148,8 @@ var renderMarkdownAsSlides = function(req, res) {
}
};

var getScript = function (req, res) {
res.sendFile( opts.scripts[req.url.substr( req.url.indexOf('/scripts/') + 9 )] );
var getScript = function(req, res) {
res.sendFile(opts.scripts[req.url.substr(req.url.indexOf('/scripts/') + 9)]);
};

var render = function(res, markdown) {
Expand Down Expand Up @@ -187,7 +186,7 @@ var renderMarkdownFileListing = function(req, res) {
res.send(generateMarkdownListing());
};

var to_html = function (options) {
var to_html = function(options) {
var initialMarkdownPath = path.join(options.basePath, options.initialMarkdownPath);
fillOpts(options);

Expand Down

0 comments on commit 85a1c71

Please sign in to comment.