From 176a73f4e919afbd2fee544ff8812ae996d10208 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 2 Jan 2013 07:56:07 -0500 Subject: [PATCH] messageTray: Clean up variable names Variable names like "sourceNotificationStackDoneShowing" are too long, and too undescriptive: this one points to a source, not a notification stack that has been done showing. --- js/ui/messageTray.js | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js index 64fcecf33..635ee2677 100644 --- a/js/ui/messageTray.js +++ b/js/ui/messageTray.js @@ -2768,17 +2768,14 @@ const MessageTray = new Lang.Class({ this._summaryBoxPointerState = State.HIDDEN; this._summaryBoxPointer.bin.child = null; - let sourceNotificationStackDoneShowing = null; if (doneShowingNotificationStack) { + let source = this._summaryBoxPointerItem.source; + this._summaryBoxPointerItem.doneShowingNotificationStack(); - sourceNotificationStackDoneShowing = this._summaryBoxPointerItem.source; - } + this._summaryBoxPointerItem = null; - this._summaryBoxPointerItem = null; - - if (sourceNotificationStackDoneShowing) { - if (sourceNotificationStackDoneShowing.isTransient && !this._reNotifyAfterHideNotification) - sourceNotificationStackDoneShowing.destroy(NotificationDestroyedReason.EXPIRED); + if (source.isTransient && !this._reNotifyAfterHideNotification) + source.destroy(NotificationDestroyedReason.EXPIRED); if (this._reNotifyAfterHideNotification) { this._onNotify(this._reNotifyAfterHideNotification.source, this._reNotifyAfterHideNotification); this._reNotifyAfterHideNotification = null;