From 9793af8582ba804b5e80fd7445abb6213b87be62 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 1 Apr 2013 12:56:26 +0100 Subject: Remove implicit call to closeAll in asString --- lib/documents.js | 1 + lib/html-generator.js | 1 - tests/html-generator.tests.js | 5 +++++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/documents.js b/lib/documents.js index ba2e8ec..1b52bf4 100644 --- a/lib/documents.js +++ b/lib/documents.js @@ -19,6 +19,7 @@ function DocumentConverter(options) { function convertToHtml(document) { var html = new HtmlGenerator(); elementToHtml(document, html); + html.closeAll(); return q.when({ html: html.asString() diff --git a/lib/html-generator.js b/lib/html-generator.js index 38e3619..3df611d 100644 --- a/lib/html-generator.js +++ b/lib/html-generator.js @@ -17,7 +17,6 @@ function HtmlGenerator() { } function asString() { - popAll(); return fragments.join(""); } diff --git a/tests/html-generator.tests.js b/tests/html-generator.tests.js index 4510351..c19acbe 100644 --- a/tests/html-generator.tests.js +++ b/tests/html-generator.tests.js @@ -21,12 +21,14 @@ describe('HtmlGenerator', function() { var generator = new HtmlGenerator(); generator.style(styles.elements(["p", "span"])); generator.text("Hello!"); + generator.closeAll(); return assert.equal(generator.asString(), "

Hello!

"); }); test('elements with no text are not generated', function() { var generator = new HtmlGenerator(); generator.style(styles.elements(["p", "span"])); + generator.closeAll(); return assert.equal(generator.asString(), ""); }); @@ -34,6 +36,7 @@ describe('HtmlGenerator', function() { var generator = new HtmlGenerator(); generator.style(styles.elements(["p", "span"])); generator.text("") + generator.closeAll(); return assert.equal(generator.asString(), ""); }); @@ -47,6 +50,7 @@ describe('HtmlGenerator', function() { generator.text("Apple"); generator.style(listStyle); generator.text("Banana"); + generator.closeAll(); return assert.equal(generator.asString(), ""); }); @@ -56,6 +60,7 @@ describe('HtmlGenerator', function() { styles.element("p", {"class": "tip"}) ])); generator.text("Hello!"); + generator.closeAll(); return assert.equal(generator.asString(), '

Hello!

'); }); }) -- cgit v1.2.3