diff --git a/source/documents/scripts/services/reader/json.js.coffee b/source/documents/scripts/services/reader/json.js.coffee index 8948562..71b3c3a 100644 --- a/source/documents/scripts/services/reader/json.js.coffee +++ b/source/documents/scripts/services/reader/json.js.coffee @@ -9,15 +9,12 @@ angular.module("sideBySide").factory("jsonReader", () -> return (source) -> parsed = eval('(' + source + ')') - newContent = [] - for verse in parsed.content + for i,verse of parsed.content if typeof(verse) == "string" - newContent.push({ section: "", text: verse }) + parsed.content[i] = { section: "", text: verse } else - if "section" not of verse - verse.section = "" - newContent.push(verse) + verse.section = "" if "section" not of verse + parsed.content[i] = verse - parsed.content = newContent return parsed ) diff --git a/source/documents/scripts/services/reader/markdown.js.coffee b/source/documents/scripts/services/reader/markdown.js.coffee index d758796..a73b15d 100644 --- a/source/documents/scripts/services/reader/markdown.js.coffee +++ b/source/documents/scripts/services/reader/markdown.js.coffee @@ -27,8 +27,7 @@ angular.module("sideBySide").factory("markdownReader", () -> readSection = (lexed) -> items = [] while lexed.length > 0 - if lexed[0]["type"] == "heading" - break + break if lexed[0]["type"] == "heading" items.push(lexed.shift()) return items @@ -40,10 +39,9 @@ angular.module("sideBySide").factory("markdownReader", () -> content = [] while lexed.length > 0 - if lexed[0]["type"] == "heading" - heading = lexed.shift().text - else - heading = '' + heading = if lexed[0]["type"] == "heading" \ + then lexed.shift().text \ + else heading = '' text = readSection(lexed) text.links = lexed.links @@ -51,7 +49,6 @@ angular.module("sideBySide").factory("markdownReader", () -> section: heading text: marked.parser(text) }) - return content lexed = marked.lexer(source)