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

Strip query params from displayed link URLs

Browse source 
Looks to chaotic otherwise.
This commit is contained in:
Gina Häußge 2017-11-10 10:50:25 +01:00
parent 69f9c523f9
commit 651a8f315b
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -54,6 +54,18 @@ $(function() {
return !data.forced;
};
self.cleanedLink = function(data) {
// Strips any query parameters from the link and returns it
var link = data.link;
if (!link) return link;
var queryPos = link.indexOf("?");
if (queryPos !== -1) {
link = link.substr(0, queryPos);
}
return link;
};
self.markRead = function(channel, until) {
if (!self.loginState.isAdmin()) return;

2
src/octoprint/plugins/announcements/templates/announcements.jinja2
View file

@ -27,7 +27,7 @@
<h3><a data-bind="text: $data.title, attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a> <small data-bind="text: formatTimeAgo($data.published), attr: {title: formatDate($data.published)}"></small></h3>
<div class="content" data-bind="html: $data.summary"></div>
<div class="actions">
<span class="articlelink"><small><a data-bind="text: $data.link, attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a></small></span>
<span class="articlelink"><small><a data-bind="text: $root.cleanedLink($data), attr: {href: $data.link}" target="_blank" rel="noreferrer noopener"></a></small></span>
<span class="markread"><small><a href="javascript:void(0)" data-bind="click: function() { $root.markRead($parent.key, $data.published) }"><i class="fa fa-eye"></i> {{ _('Mark as last read') }}</a></small></span>
</div>
</article>