nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'next-minor' into develop

Browse source
This commit is contained in:
Benjamin Neff 2018-04-10 01:58:07 +02:00
commit 89f7f97294
No known key found for this signature in database
GPG key ID: 971464C3F1A90194
3 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -20,6 +20,10 @@
## Features ## Features
# 0.7.4.1
Fixes a possible cross-site scripting issue with maliciously crafted OpenGraph metadata.
# 0.7.4.0 # 0.7.4.0
## Refactor ## Refactor

11
app/assets/javascripts/app/helpers/truncate.js
View file

@ -1,14 +1,11 @@
(function() { (function() {
app.helpers.truncate = function(passedString, length) { app.helpers.truncate = function(passedString, length) {
if (passedString === null || passedString === undefined) { if (passedString === null || passedString === undefined || passedString.length < length) {
return passedString; return passedString;
} }
if (passedString.length > length) { var lastBlank = passedString.lastIndexOf(" ", length);
var lastBlank = passedString.lastIndexOf(' ', length); var trimstring = passedString.substring(0, Math.min(length, lastBlank));
var trimstring = passedString.substring(0, Math.min(length, lastBlank)); return trimstring + " ...";
return new Handlebars.SafeString(trimstring + " ...");
}
return new Handlebars.SafeString(passedString);
}; };
})(); })();

12
spec/javascripts/app/helpers/truncate_spec.js
View file

@ -6,4 +6,16 @@ describe("app.helpers.truncate", function() {
it("handles undefined", function() { it("handles undefined", function() {
expect(app.helpers.truncate(undefined, 123)).toEqual(undefined); expect(app.helpers.truncate(undefined, 123)).toEqual(undefined);
}); });
it("returns a short string", function() {
expect(app.helpers.truncate("Some text", 10)).toEqual("Some text");
});
it("trims a long string at a space", function() {
expect(app.helpers.truncate("Some very long text", 10)).toEqual("Some very ...");
});
it("returns a string", function() {
expect(typeof app.helpers.truncate("Some very long text", 10)).toEqual("string");
});
}); });