From acbc8446002a007bc113b9171aadba48d1765b55 Mon Sep 17 00:00:00 2001 From: Johannes Nickel Date: Sun, 11 Jan 2015 19:18:58 +0100 Subject: [PATCH] updated mark all as seen to work properly --- .../controllers/widget/online_notification.js.coffee | 11 ++++------- .../app/views/widget/online_notification.jst.eco | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee b/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee index 459010f26..da4480653 100644 --- a/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee +++ b/app/assets/javascripts/app/controllers/widget/online_notification.js.coffee @@ -75,15 +75,12 @@ class App.OnlineNotificationWidget extends App.Controller App.i18n.translateInline( 'Notifications' ) + " #{counter}" content: => # insert data - html = $( App.view('widget/online_notification')( - items: items - )) - html.on('click', (e) => - e.preventDefault() - @markAllAsSeen(items) - ) + $( App.view('widget/online_notification')(items: items)) ).on('shown.bs.popover', => # show frontend times + $('#markAllAsSeen').bind('click', (e) => + @markAllAsSeen(items) + ); @frontendTimeUpdate() ) diff --git a/app/assets/javascripts/app/views/widget/online_notification.jst.eco b/app/assets/javascripts/app/views/widget/online_notification.jst.eco index 577c01683..b9e59222c 100644 --- a/app/assets/javascripts/app/views/widget/online_notification.jst.eco +++ b/app/assets/javascripts/app/views/widget/online_notification.jst.eco @@ -1,5 +1,5 @@ <% if @items.length: %> - <%- @T( 'Mark all as seen.' ) %> + <%- @T( 'Mark all as seen.' ) %> <% for item in @items: %>