isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

messageTray: Simplify code

Browse Source 
If notificationRemoved, then mustClose is true, so we don't need to
double-check for this.
This commit is contained in:
Jasper St. Pierre 2013-11-04 14:16:28 -05:00
parent da4238ec68
commit 143dfb6246
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
js/ui/messageTray.js
View File

@ -2373,7 +2373,6 @@ const MessageTray = new Lang.Class({
this._showNotification();
}
} else if (this._notificationState == State.SHOWN) {
let pinned = this._pointerInNotification && !this._notificationRemoved;
let expired = (this._userActiveWhileNotificationShown &&
this._notificationTimeoutId == 0 &&
!(this._notification.urgency == Urgency.CRITICAL) &&
@ -2384,9 +2383,9 @@ const MessageTray = new Lang.Class({
if (mustClose) {
let animate = hasNotifications && !this._notificationRemoved;
this._hideNotification(animate);
} else if (pinned && !this._notification.expanded) {
} else if (this._pointerInNotification && !this._notification.expanded) {
this._expandNotification(false);
} else if (pinned) {
} else if (this._pointerInNotification) {
this._ensureNotificationFocused();
}
}