diff options
author | Jonne Haß <me@jhass.eu> | 2014-10-14 15:37:05 +0400 |
---|---|---|
committer | Jonne Haß <me@jhass.eu> | 2014-10-14 15:37:55 +0400 |
commit | 1c0cf989588854e5033eac9e09b856e9e5815681 (patch) | |
tree | b3abdec710edfd40d40c616152cf0b593e090137 /app | |
parent | e5b20106c62e4c03baf28d30ec514f74610192ca (diff) | |
parent | bd24d6bebe6805b412a11df9f8bfcf67cf7af7cb (diff) |
Merge pull request #5237 from jaideng123/added_infinite_scrolling_to_notedropdown
Notifications Dropdown infinite scrolling
Diffstat (limited to 'app')
-rw-r--r-- | app/assets/javascripts/widgets/notifications-badge.js | 36 |
1 files changed, 31 insertions, 5 deletions
diff --git a/app/assets/javascripts/widgets/notifications-badge.js b/app/assets/javascripts/widgets/notifications-badge.js index 0509d0adc..6c775b9be 100644 --- a/app/assets/javascripts/widgets/notifications-badge.js +++ b/app/assets/javascripts/widgets/notifications-badge.js @@ -1,6 +1,9 @@ (function() { var NotificationDropdown = function() { var self = this; + var currentPage = 2; + var notificationsLoaded = 10; + var isLoading = false; this.subscribe("widget/ready",function(evt, badge, dropdown) { $.extend(self, { @@ -43,8 +46,9 @@ self.ajaxLoader.show(); self.badge.addClass("active"); self.dropdown.css("display", "block"); - + $('.notifications').addClass("loading"); self.getNotifications(); + }; this.hideDropdown = function() { @@ -53,8 +57,17 @@ $('.notifications').perfectScrollbar('destroy'); }; + this.getMoreNotifications = function() { + $.getJSON("/notifications?per_page=5&page="+currentPage, function(notifications) { + for(var i = 0; i < notifications.length; ++i) + self.notifications.push(notifications[i]); + notificationsLoaded += 5; + self.renderNotifications(); + }); + }; + this.getNotifications = function() { - $.getJSON("/notifications?per_page=15", function(notifications) { + $.getJSON("/notifications?per_page="+notificationsLoaded, function(notifications) { self.notifications = notifications; self.renderNotifications(); }); @@ -62,10 +75,10 @@ this.renderNotifications = function() { self.dropdownNotifications.empty(); - $.each(self.notifications, function(index, notifications) { $.each(notifications, function(index, notification) { - self.dropdownNotifications.append(notification.note_html); + if($.inArray(notification, notifications) === -1) + self.dropdownNotifications.append(notification.note_html); }); }); self.dropdownNotifications.find("time.timeago").timeago(); @@ -76,9 +89,22 @@ self.dropdownNotifications.find('.read').each(function(index) { Diaspora.page.header.notifications.setUpRead( $(this) ); }); + $('.notifications').perfectScrollbar('destroy'); $('.notifications').perfectScrollbar(); - $(".notifications").scrollTop(0); self.ajaxLoader.hide(); + isLoading = false; + $('.notifications').removeClass("loading"); + //Infinite Scrolling + $('.notifications').scroll(function(e) { + var bottom = $('.notifications').prop('scrollHeight') - $('.notifications').height(); + var currentPosition = $('.notifications').scrollTop(); + isLoading = ($('.loading').length == 1); + if (currentPosition + 50 >= bottom && notificationsLoaded <= self.notifications.length && !isLoading) { + $('.notifications').addClass("loading"); + ++currentPage; + self.getMoreNotifications(); + } + }); }; }; |