Merge pull request #91 from nextcloud/fix-notifications-order

Append notifications on initial fetch but prepend them on polling

1 files changed, 12 insertions, 3 deletions

diff --git a/js/app.js b/js/app.js
index 912bb37..7d16292 100644
--- a/js/app.js
+++ b/js/app.js
@@ -227,7 +227,8 @@
 			this._fetch(
 				function(data) {
 					var inJson = [],
-						oldNum = self.numNotifications();
+						oldNum = self.numNotifications(),
+						resort = false;
 
 					_.each(data, function(notification) {
 						var n = new self.Notification(notification);
@@ -235,9 +236,18 @@
 						if (!self.getNotification(n.getId())) {
 							// New notification!
 							self._onNewNotification(n);
+							resort = true;
 						}
 					});
 
+					if (resort) {
+						self.$container.find('.notification').sort(function (prev, next) {
+							return parseInt(next.dataset.timestamp) - parseInt(prev.dataset.timestamp);
+						}).each(function() {
+							$(self.$container.find('.notification-wrapper')).append(this);
+						});
+					}
+
 					_.each(self.getNotifications(), function(n) {
 						if (inJson.indexOf(n.getId()) === -1) {
 							// Not in JSON, remove from UI
@@ -381,10 +391,9 @@
 				var $fullMessage = $(this).parent().find('.notification-full-message');
 				$(this).addClass('hidden');
 				$fullMessage.removeClass('hidden');
-
 			});
 
-			this.$container.find('.notification-wrapper').prepend($element);
+			this.$container.find('.notification-wrapper').append($element);
 		},
 
 		/**