aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Williamson <mike@zwobble.org>2013-04-01 12:56:26 +0100
committerMichael Williamson <mike@zwobble.org>2013-04-01 12:56:26 +0100
commit9793af8582ba804b5e80fd7445abb6213b87be62 (patch)
treeab344a690b86060e2282118e681343dfb5e889ac
parentad75779025dd2fdae2eab851e1be1c6e5b8955ef (diff)
Remove implicit call to closeAll in asString
-rw-r--r--lib/documents.js1
-rw-r--r--lib/html-generator.js1
-rw-r--r--tests/html-generator.tests.js5
3 files changed, 6 insertions, 1 deletions
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(), "<p><span>Hello!</span></p>");
});
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(), "<ul><li>Apple</li><li>Banana</li></ul>");
});
@@ -56,6 +60,7 @@ describe('HtmlGenerator', function() {
styles.element("p", {"class": "tip"})
]));
generator.text("Hello!");
+ generator.closeAll();
return assert.equal(generator.asString(), '<p class="tip">Hello!</p>');
});
})