From: Alexander Ebert <ebert@woltlab.com>
Date: Fri, 28 Nov 2014 12:20:49 +0000 (+0100)
Subject: Fixed notification dropdown behavior
X-Git-Tag: 2.1.0_Beta_1~128
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d3c53609cb43580ba0d1fa1b12cf8ae02b14496a;p=GitHub%2FWoltLab%2FWCF.git

Fixed notification dropdown behavior
---

diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index aa03774b83..cd473f9ef7 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -1476,6 +1476,11 @@ WCF.Notification.UserPanel = WCF.UserPanel.extend({
 				$('<li class="dropdownDivider" />').insertAfter($insertAfter);
 			}
 		}
+		
+		var $badge = this._container.find('.badge');
+		if (!$badge.length) {
+			this._removeMarkAllAsConfirmed();
+		}
 	},
 	
 	/**
@@ -1536,11 +1541,14 @@ WCF.Notification.UserPanel = WCF.UserPanel.extend({
 			
 			case 'markAllAsConfirmed':
 				this._resetList();
-			// fall through
+				
+				this._updateBadge(0);
+				this._removeMarkAllAsConfirmed();
+			break;
+			
 			case 'getOutstandingNotifications':
 				if (!data.returnValues || !data.returnValues.template) {
-					$('#userNotificationsMarkAllAsConfirmed').prev('.dropdownDivider').remove();
-					$('#userNotificationsMarkAllAsConfirmed').remove();
+					this._removeMarkAllAsConfirmed();
 				}
 				
 				this._super(data, textStatus, jqXHR);
@@ -1559,6 +1567,10 @@ WCF.Notification.UserPanel = WCF.UserPanel.extend({
 		if (this._favico !== null) {
 			this._favico.badge(count);
 		}
+		
+		if (count === 0) {
+			this._removeMarkAllAsConfirmed();
+		}
 	},
 	
 	/**
@@ -1570,9 +1582,17 @@ WCF.Notification.UserPanel = WCF.UserPanel.extend({
 		
 		$('<li class="jsDropdownPlaceholder"><span>' + WCF.Language.get('wcf.global.loading') + '</span></li>').prependTo($dropdownMenu);
 		
+		// remove double separators
+		$dropdownMenu.children('.dropdownDivider + .dropdownDivider').remove();
+		
 		this._didLoad = false;
 	},
 	
+	_removeMarkAllAsConfirmed: function() {
+		$('#userNotificationsMarkAllAsConfirmed').prev('.dropdownDivider').remove();
+		$('#userNotificationsMarkAllAsConfirmed').remove();
+	},
+	
 	/**
 	 * Updates user notification count.
 	 *