few stylistic improvements

jbt · Dec 13, 2015 · f2adc0c · f2adc0c
1 parent 1c2236b
commit f2adc0c
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/res/tmpl.ejs b/res/tmpl.ejs
@@ -6,15 +6,18 @@
   <link rel="stylesheet" media="all" href="<%= relativeDir %>doc-style.css" />
   <script src="<%= relativeDir %>doc-filelist.js"></script>
   <script>
-    var relativeDir = <%- JSON.stringify(relativeDir) %>, thisFile = <%- JSON.stringify(filename) %>, defaultSidebar = <%= sidebar === 'disable' ? 'false' : sidebar %>;
+    var relativeDir = <%- JSON.stringify(relativeDir) %>;
+    var thisFile = <%- JSON.stringify(filename) %>;
+    var defaultSidebar = <%= sidebar === 'disable' ? 'false' : sidebar %>;
   </script>
   <script src="<%= relativeDir %>doc-script.js"></script>
-<% for(var i = 0; i < js.length; i += 1){ %>
-  <script src="<%= relativeDir + js[i] %>"></script>
-<% }
-   for(var i = 0; i < css.length; i += 1){ %>
-  <link rel="stylesheet" href="<%= relativeDir + css[i] %>" />
-<% } %>
+<% js.forEach(function(j){ %>
+  <script src="<%= relativeDir + j %>"></script>
+<% });
+
+   css.forEach(function(c){ %>
+  <link rel="stylesheet" href="<%= relativeDir + c %>" />
+<% }); %>
 </head>
 <body<%= sidebar === 'disable' ? ' class="no-sidebar"' : '' %>>
   <div id="sidebar_wrapper">

diff --git a/src/docker.js b/src/docker.js
@@ -2,6 +2,7 @@ var stripIndent = require('strip-indent');
 var MarkdownIt = require('markdown-it');
 var highlight = require('highlight.js');
 var repeating = require('repeating');
+var debounce = require('debounce');
 var mkdirp = require('mkdirp');
 var extend = require('extend');
 var watchr = require('watchr');
@@ -58,12 +59,11 @@ var Docker = module.exports = function(opts){
   this.tree = {};
 
   var extrasRoot = path.resolve(__dirname, '..', 'extras');
-  for(var i = 0; i < opts.extras.length; i += 1){
-    var extraName = opts.extras[i];
 
-    opts.js.push(path.join(extrasRoot, extraName, extraName + '.js'));
-    opts.css.push(path.join(extrasRoot, extraName, extraName + '.css'));
-  }
+  opts.extras.forEach(function(e){
+    opts.js.push(path.join(extrasRoot, e, e + '.js'));
+    opts.css.push(path.join(extrasRoot, e, e + '.css'));
+  });
 };
 
 Docker.prototype.doc = function(files){
@@ -260,12 +260,14 @@ Docker.prototype.addFileToTree = function(filename){
   //    ]
   //  }
   // ```
-  var currDir  = this.tree;
-  for(var i = 0; i < bits.length - 1; i += 1){
+  var currDir = this.tree;
+  var lastBit = bits.pop();
+
+  bits.forEach(function(bit){
     if(!currDir.dirs) currDir.dirs = {};
-    if(!currDir.dirs[bits[i]]) currDir.dirs[bits[i]] = {};
-    currDir = currDir.dirs[bits[i]];
-  }
+    if(!currDir.dirs[bit]) currDir.dirs[bit] = {};
+    currDir = currDir.dirs[bit];
+  });
   if(!currDir.files) currDir.files = [];
 
   var lastBit = bits[bits.length - 1];
@@ -389,7 +391,7 @@ Docker.prototype.parseSections = function(data, lang){
           if(lang.jsDoc){
 
             // Strip off leading * characters.
-            multiLine = multiLine.replace(/^[ \t]*\*? ?/gm, "");
+            multiLine = multiLine.replace(/^[ \t]*\*? ?/gm, '');
 
             jsDocData = dox.parseComment(multiLine, { raw: true });
 
@@ -421,7 +423,7 @@ Docker.prototype.parseSections = function(data, lang){
           section = { docs: '', code: '' };
         }
         inMultiLineComment = true;
-        multiLine = line + "\n";
+        multiLine = line + '\n';
         return;
       }
     }
@@ -492,8 +494,8 @@ Docker.prototype.makeOutputFile = function(filename, content, headings, cb){
   // a relative href rather than an absolute one
   var outDir = path.dirname(outFile);
   var relativeOut = path.resolve(outDir)
-                    .replace(path.resolve(this.options.outDir),'')
-                    .replace(/^[\/\\]/,'');
+                      .replace(path.resolve(this.options.outDir),'')
+                      .replace(/^[\/\\]/,'');
   var levels = relativeOut == '' ? 0 : relativeOut.split(path.sep).length;
   var relDir = repeating('../', levels);