aboutsummaryrefslogtreecommitdiffstats
path: root/view/js/main.js
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-10-10 16:05:56 -0700
committerzotlabs <mike@macgirvin.com>2017-10-10 16:05:56 -0700
commitf273815d8ff45a28b36bd5121c58422dfc28d0ff (patch)
treef51f4dbfe646b41c1016c85589701cdc44db40e7 /view/js/main.js
parent87970491441cb15462d3fe7a7641d2f2755cb45b (diff)
parent07ae4319501ac6edc024a849b4d060f171f27178 (diff)
downloadvolse-hubzilla-f273815d8ff45a28b36bd5121c58422dfc28d0ff.tar.gz
volse-hubzilla-f273815d8ff45a28b36bd5121c58422dfc28d0ff.tar.bz2
volse-hubzilla-f273815d8ff45a28b36bd5121c58422dfc28d0ff.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'view/js/main.js')
-rw-r--r--view/js/main.js7
1 files changed, 1 insertions, 6 deletions
diff --git a/view/js/main.js b/view/js/main.js
index 6557b1d8e..ea8d1a3ab 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -365,11 +365,6 @@ $(function() {
return;
});
- $('span[rel^="#"]').click(function(e){
- manage_popup_menu(this, e);
- return;
- });
-
function manage_popup_menu(w,e) {
menu = $( $(w).attr('rel') );
@@ -992,7 +987,7 @@ function notify_popup_loader(notifyType) {
html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass);
$("#nav-" + notifyType + "-menu").append(html);
});
- $(".dropdown-menu img[data-src], .dropdown-item img[data-src]").each(function(i, el){
+ $(".dropdown-menu img[data-src], .notification img[data-src]").each(function(i, el){
// Replace data-src attribute with src attribute for every image
$(el).attr('src', $(el).data("src"));
$(el).removeAttr("data-src");