TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-23 22:11:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1840 from hswolff/fix-content-helper

Browse Source 
Fix {{content words=“0”}} to actually return 0 words
This commit is contained in:
Hannah Wolfe 2014-01-04 08:45:26 -08:00
commit d51e63c7b7
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/server/helpers/index.js
View File

@ -217,7 +217,13 @@ coreHelpers.content = function (options) {
truncateOptions[key] = parseInt(truncateOptions[key], 10);
});
if (truncateOptions.words || truncateOptions.characters) {
if (truncateOptions.hasOwnProperty('words') || truncateOptions.hasOwnProperty('characters')) {
// Due to weirdness in downsize the 'words' option
// must be passed as a string. refer to #1796
// TODO: when downsize fixes this quirk remove this hack.
if (truncateOptions.hasOwnProperty('words')) {
truncateOptions.words = truncateOptions.words.toString();
}
return new hbs.handlebars.SafeString(
downsize(this.html, truncateOptions)
);

28
core/test/unit/server_helpers_index_spec.js
View File

@ -75,6 +75,34 @@ describe('Core Helpers', function () {
rendered.string.should.equal("<p>Hello <strong>World</strong></p>");
});
it('can truncate html to 0 words', function () {
var html = "<p>Hello <strong>World! It's me!</strong></p>",
rendered = (
helpers.content
.call(
{html: html},
{"hash": {"words": "0"}}
)
);
should.exist(rendered);
rendered.string.should.equal("<p></p>");
});
it('can truncate html to 0 words, leaving image tag if it is first', function () {
var html = "<p><img src='example.jpg' />Hello <strong>World! It's me!</strong></p>",
rendered = (
helpers.content
.call(
{html: html},
{"hash": {"words": "0"}}
)
);
should.exist(rendered);
rendered.string.should.equal("<p><img src='example.jpg' /></p>");
});
it('can truncate html by character', function () {
var html = "<p>Hello <strong>World! It's me!</strong></p>",
rendered = (