diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-01-25 17:27:48 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-01-25 17:27:48 +0100 |
| commit | 4656856dfbf41e855b1bb8625290c07a5dcf8d38 (patch) | |
| tree | 94b5f1882110f92cf83b8e9185295a8206a9ebeb | |
| parent | 019dcefecad12fb99f5b5caddd6a73ed4a99addb (diff) | |
| download | volse-hubzilla-4656856dfbf41e855b1bb8625290c07a5dcf8d38.tar.gz volse-hubzilla-4656856dfbf41e855b1bb8625290c07a5dcf8d38.tar.bz2 volse-hubzilla-4656856dfbf41e855b1bb8625290c07a5dcf8d38.zip | |
move template out of #notifications and revert reset timer on manual trigger
| -rw-r--r-- | view/js/main.js | 2 | ||||
| -rw-r--r-- | view/tpl/notifications_widget.tpl | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/view/js/main.js b/view/js/main.js index 41ca0bb3f..8eb02156b 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -70,8 +70,6 @@ $(document).ready(function() { if(! $('#nav-' + notifyType + '-sub').hasClass('show')) { loadNotificationItems(notifyType); - if(timer) clearTimeout(timer); - timer = setTimeout(updateInit,updateInterval); } $(this).data('clicked', true); diff --git a/view/tpl/notifications_widget.tpl b/view/tpl/notifications_widget.tpl index a42c18751..69e5e15bc 100644 --- a/view/tpl/notifications_widget.tpl +++ b/view/tpl/notifications_widget.tpl @@ -115,14 +115,14 @@ <div id="no_notifications" class="d-xl-none"> {{$no_notifications}}<span class="jumping-dots"><span class="dot-1">.</span><span class="dot-2">.</span><span class="dot-3">.</span></span> </div> + <div id="nav-notifications-template" rel="template"> + <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}"> + <img class="menu-img-3" data-src="{1}"> + <span class="contactname">{2}</span> + <span class="dropdown-sub-text">{3}<br>{4}</span> + </a> + </div> <div id="notifications" class="navbar-nav"> - <div id="nav-notifications-template" rel="template"> - <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}" data-notify_id="{7}" data-thread_top="{8}" data-contact_name="{2}"> - <img class="menu-img-3" data-src="{1}"> - <span class="contactname">{2}</span> - <span class="dropdown-sub-text">{3}<br>{4}</span> - </a> - </div> {{foreach $notifications as $notification}} <div class="collapse {{$notification.type}}-button"> <a class="list-group-item notification-link" href="#" title="{{$notification.title}}" data-target="#nav-{{$notification.type}}-sub" data-toggle="collapse" data-type="{{$notification.type}}"> |