friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Add HTML entity decoding to browser notifications

This commit is contained in:
Hypolite Petovan 2016-09-28 23:17:49 -04:00
parent af3a672570
commit 62a2d0603d
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();
}); });