pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Strip paragraphs from summaries for announcement notifications

Browse source
This commit is contained in:
Gina Häußge 2015-07-09 15:43:11 +02:00
parent 3a570f8ab0
commit 9e73f1563d
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/octoprint/plugins/announcements/static/js/announcements.js
View file

@ -182,6 +182,17 @@ $(function() {
return text;
};
var stripParagraphs = function(text) {
if (_.startsWith(text, "<p>")) {
text = text.substr("<p>".length);
}
if (_.endsWith(text, "</p>")) {
text = text.substr(0, text.length - "</p>".length);
}
return text.replace(/<\/p>\s*<p>/ig, "<br>");
};
_.each(channels, function(value) {
var key = value.key;
var channel = value.channel;
@ -209,7 +220,7 @@ $(function() {
var text = "<ul>";
_.each(displayedItems, function(item) {
var limitedSummary = item.summary_without_images.trim();
var limitedSummary = stripParagraphs(item.summary_without_images.trim());
if (limitedSummary.length > maxLength) {
limitedSummary = limitedSummary.substr(0, maxLength);
limitedSummary = limitedSummary.substr(0, Math.min(limitedSummary.length, limitedSummary.lastIndexOf(" ")));