jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2812 from Hypolite/fix-browser-notifications

Browse source 
Add HTML entity decoding to browser notifications
This commit is contained in:
Tobias Diekershoff 2016-09-29 07:40:59 +02:00 committed by GitHub
commit b0133ad11f
1 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
js/main.js
View file

@ -18,23 +18,28 @@
} }
} }
function openClose(theID) { function openClose(theID) {
if(document.getElementById(theID).style.display == "block") { if(document.getElementById(theID).style.display == "block") {
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "none"
} }
else { else {
document.getElementById(theID).style.display = "block" document.getElementById(theID).style.display = "block"
} }
} }
function openMenu(theID) { function openMenu(theID) {
document.getElementById(theID).style.display = "block" document.getElementById(theID).style.display = "block"
} }
function closeMenu(theID) { function closeMenu(theID) {
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "none"
} }
function decodeHtml(html) {
var txt = document.createElement("textarea");
txt.innerHTML = html;
return txt.value;
}
var src = null; var src = null;
@ -275,7 +280,7 @@
if (notification_lastitem!== null && notification_id > notification_lastitem) { if (notification_lastitem!== null && notification_id > notification_lastitem) {
if (getNotificationPermission()==="granted") { if (getNotificationPermission()==="granted") {
var notification = new Notification(document.title, { var notification = new Notification(document.title, {
body: e.text().replace('→ ','').format(e.attr('name')), body: decodeHtml(e.text().replace('→ ','').format(e.attr('name'))),
icon: e.attr('photo'), icon: e.attr('photo'),
}); });
notification['url'] = e.attr('href'); notification['url'] = e.attr('href');
@ -513,7 +518,7 @@
$(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl"); $(".comment-edit-form textarea").editor_autocomplete(baseurl+"/acl");
/* autocomplete bbcode */ /* autocomplete bbcode */
$(".comment-edit-form textarea").bbco_autocomplete('bbcode'); $(".comment-edit-form textarea").bbco_autocomplete('bbcode');
// setup videos, since VideoJS won't take care of any loaded via AJAX // setup videos, since VideoJS won't take care of any loaded via AJAX
if(typeof videojs != 'undefined') videojs.autoSetup(); if(typeof videojs != 'undefined') videojs.autoSetup();
}); });