From f4c2e2244d78534f1ce9e90238620b7caa13ef2a Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 29 Sep 2016 23:46:43 -0400 Subject: [PATCH] Fix #2814 - [frio] Add a wrapping `a` tag around the notification text - Add an event listener preventing popup menus to close when they are themselves clicked --- js/main.js | 2 ++ view/theme/frio/templates/nav.tpl | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/js/main.js b/js/main.js index 72bef8849..aa6a48fcb 100644 --- a/js/main.js +++ b/js/main.js @@ -130,6 +130,7 @@ function close_last_popup_menu() { if(last_popup_menu) { last_popup_menu.hide(); + last_popup_menu.off('click', function(e) {e.stopPropagation()}); last_popup_button.removeClass("selected"); last_popup_menu = null; last_popup_button = null; @@ -152,6 +153,7 @@ last_popup_button = null; } else { last_popup_menu = menu; + last_popup_menu.on('click', function(e) {e.stopPropagation()}); last_popup_button = parent; $('#nav-notifications-menu').perfectScrollbar('update'); } diff --git a/view/theme/frio/templates/nav.tpl b/view/theme/frio/templates/nav.tpl index 94f91bb4e..497b8db97 100644 --- a/view/theme/frio/templates/nav.tpl +++ b/view/theme/frio/templates/nav.tpl @@ -9,7 +9,7 @@ {{if $nav.remote}}
{{else}} - {{* #logo-img is the the placeholder to insert a mask (friendica logo) into this div + {{* #logo-img is the the placeholder to insert a mask (friendica logo) into this div For Firefox we have to call the paths of the mask (look at the bottom of this file). Because for FF we need relative paths we apply them with js after the page is loaded (look at theme.js *}}
@@ -276,13 +276,13 @@ {{*The second part of the notifications dropdown menu. It handles the notifications *}} {{if $nav.notifications}}