fixes #9: fix the situation if a document has no h1 title

kaelzhang · Oct 17, 2013 · b5fae99 · b5fae99
1 parent 0991866
commit b5fae99
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 33 deletions.
diff --git a/lib/parser.js b/lib/parser.js
@@ -237,12 +237,11 @@ parser.create_data = function (language_tree, sys, callback) {
 
             if ( html ) {
                 node.html = html;
+                // There might be no title inside the html
                 title = parser.get_title(html);
-            } else {
-                title = node.name;
             }
 
-            parser._generate_url(node, title);
+            parser._generate_url(node, title || node.name);
 
             var pages = node.pages;
 
@@ -318,6 +317,10 @@ parser._generate_url = function (node, name) {
         node.url = '';
 
     } else {
+        if ( !name ) {
+            console.log(node);
+        }
+
         var cooked = parser.cook_name(name);
         node.display_name = cooked.display_name;
         node.uri_name = cooked.uri_name;

diff --git a/lib/tools.js b/lib/tools.js
@@ -31,8 +31,8 @@ tools.nav = function (tree, current_doc, config) {
             var is_folder = node.type === 'folder';
 
             if ( is_folder ) {
-                var href = node.url && node.html && (config.site_root + node.url);
-                html += '<a href="' + (href || '#') + '" class="J_nav J_has-content folder">' + node.display_name + '</a>';
+                var content_link = node.url && node.html && (config.site_root + node.url);
+                html += '<a href="' + (content_link || '#') + '" class="J_nav ' + (content_link ? 'J_has-content ' : '') + 'folder">' + node.display_name + '</a>';
 
                 html += tools.nav(node, current_doc, config);
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "document",
-  "version": "0.3.1",
+  "version": "0.3.2",
   "description": "Create your document site with just one command.",
   "// main": "index.js",
   "bin": {

diff --git a/test/repo/doc/config.json b/test/repo/doc/config.json