Quiz with GFM checkbox lists

1 files changed, 11 insertions, 10 deletions

diff --git a/lib/parse/lex.js b/lib/parse/lex.js
index b77b844..a9ff1ba 100644
--- a/lib/parse/lex.js
+++ b/lib/parse/lex.js
@@ -17,6 +17,10 @@ function splitSections(nodes) {
     }, []).concat([section]); // Add remaining nodes
 }
 
+function isQuizNode(node) {
+    return /^[(\[][ x][)\]]/.test(node.text || node);
+}
+
 // What is the type of this section
 function sectionType(nodes, idx) {
     var codeType = { type: 'code' };
@@ -35,16 +39,13 @@ function sectionType(nodes, idx) {
     }
 
     if (nodes.length > 2) {
-        var nonBlockquoteNodes = nodes.slice(nodes[0].type === 'paragraph' ? 1 : 0);
-        nonBlockquoteNodes.splice(_.findIndex(nonBlockquoteNodes, { type: 'blockquote_start' }),
-                                  _.findIndex(nonBlockquoteNodes, { type: 'blockquote_end' }));
-
-        if (nonBlockquoteNodes.length === 2) {
-            if (_.every(nonBlockquoteNodes, { type: 'table' })) {
-                if (_.every(nonBlockquoteNodes[0].cells, function(row) {
-                  return _.every(row.slice(1), function(cell) { return cell === "( )"; });
-                })) {
-                  return 'quiz';
+        var potentialQuizNodes = nodes.slice(nodes[0].type === 'paragraph' ? 1 : 0);
+        if (_.some(potentialQuizNodes, { type: 'blockquote_start' })) {
+            for (var i = 0; i < potentialQuizNodes.length; i++) {
+                var node = potentialQuizNodes[i];
+                if ((node.type === 'list_item_start' && isQuizNode(potentialQuizNodes[i+1])) ||
+                    (node.type === 'table' && _.every(potentialQuizNodes[i].cells[0].slice(1), isQuizNode))){
+                    return 'quiz'
                 }
             }
         }