diff options
| author | Michael Williamson <mike@zwobble.org> | 2013-04-08 20:58:22 +0100 |
|---|---|---|
| committer | Michael Williamson <mike@zwobble.org> | 2013-04-08 20:58:22 +0100 |
| commit | b4e24fbcb96743e7a81156526ef4e994f4af20e4 (patch) | |
| tree | ce88d66b001967098d0ddbe4b09b3d888eefb5ec | |
| parent | 03716aafae79ce637bd130b006faac3ffd42499d (diff) | |
Rename HtmlGenerator.style to satisfyPath
| -rw-r--r-- | lib/document-to-html.js | 4 | ||||
| -rw-r--r-- | lib/html-generator.js | 4 | ||||
| -rw-r--r-- | tests/html-generator.tests.js | 14 |
3 files changed, 11 insertions, 11 deletions
diff --git a/lib/document-to-html.js b/lib/document-to-html.js index e5c1def..da1a69f 100644 --- a/lib/document-to-html.js +++ b/lib/document-to-html.js @@ -41,7 +41,7 @@ function DocumentConverter(options) { } function convertParagraph(element, html) { - html.style(styleForParagraph(element)); + html.satisfyPath(styleForParagraph(element)); return convertElements(element.children, html); } @@ -54,7 +54,7 @@ function DocumentConverter(options) { if (run.styleName) { var style = runStyleMap[run.styleName]; if (style) { - runHtml.style(style); + runHtml.satisfyPath(style); } } if (run.isBold) { diff --git a/lib/html-generator.js b/lib/html-generator.js index fd6aac7..c866051 100644 --- a/lib/html-generator.js +++ b/lib/html-generator.js @@ -29,7 +29,7 @@ function HtmlGenerator() { }); } - function style(style) { + function satisfyPath(style) { var firstFreshPartIndex = findIndex(style, function(part) { return part.fresh; }); @@ -95,7 +95,7 @@ function HtmlGenerator() { } return { - style: style, + satisfyPath: satisfyPath, text: text, open: open, close: close, diff --git a/tests/html-generator.tests.js b/tests/html-generator.tests.js index d118b27..fc34cf9 100644 --- a/tests/html-generator.tests.js +++ b/tests/html-generator.tests.js @@ -19,7 +19,7 @@ describe('HtmlGenerator', function() { test('asString closes all elements', function() { var generator = new HtmlGenerator(); - generator.style(htmlPaths.elements(["p", "span"])); + generator.satisfyPath(htmlPaths.elements(["p", "span"])); generator.text("Hello!"); generator.closeAll(); return assert.equal(generator.asString(), "<p><span>Hello!</span></p>"); @@ -27,14 +27,14 @@ describe('HtmlGenerator', function() { test('elements with no text are not generated', function() { var generator = new HtmlGenerator(); - generator.style(htmlPaths.elements(["p", "span"])); + generator.satisfyPath(htmlPaths.elements(["p", "span"])); generator.closeAll(); return assert.equal(generator.asString(), ""); }); test('generates empty string if text is empty string', function() { var generator = new HtmlGenerator(); - generator.style(htmlPaths.elements(["p", "span"])); + generator.satisfyPath(htmlPaths.elements(["p", "span"])); generator.text("") generator.closeAll(); return assert.equal(generator.asString(), ""); @@ -42,13 +42,13 @@ describe('HtmlGenerator', function() { test('can leave some HTML elements for next style', function() { var generator = new HtmlGenerator(); - var listStyle = htmlPaths.elements([ + var listPath = htmlPaths.elements([ htmlPaths.element("ul", {}, {fresh: false}), htmlPaths.element("li", {}, {fresh: true}) ]) - generator.style(listStyle); + generator.satisfyPath(listPath); generator.text("Apple"); - generator.style(listStyle); + generator.satisfyPath(listPath); generator.text("Banana"); generator.closeAll(); return assert.equal(generator.asString(), "<ul><li>Apple</li><li>Banana</li></ul>"); @@ -56,7 +56,7 @@ describe('HtmlGenerator', function() { test('renders class attribute of elements', function() { var generator = new HtmlGenerator(); - generator.style(htmlPaths.elements([ + generator.satisfyPath(htmlPaths.elements([ htmlPaths.element("p", {"class": "tip"}) ])); generator.text("Hello!"); |
