From 355215ca911156abfb909e972a3651617dd0b79a Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 6 Nov 2015 16:03:34 -0500
Subject: [PATCH] FIX: Couldn't collapse validation messages

---
 .../javascripts/discourse/components/popup-input-tip.js.es6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6 b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
index ce2dc31c532..c63997674c9 100644
--- a/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
+++ b/app/assets/javascripts/discourse/components/popup-input-tip.js.es6
@@ -10,7 +10,8 @@ export default Ember.Component.extend(StringBuffer, {
   rerenderTriggers: ['validation.reason'],
 
   click() {
-    this.set('shownAt', false);
+    this.set('shownAt', null);
+    this.set('validation.lastShownAt', null);
   },
 
   bad: Ember.computed.alias("validation.failed"),
@@ -40,8 +41,7 @@ export default Ember.Component.extend(StringBuffer, {
     const reason = this.get('validation.reason');
     if (!reason) { return; }
 
-    buffer.push("<span class='close'>" + iconHTML('times-circle') + "</span>");
-    buffer.push(reason);
+    buffer.push(`<span class='close'>${iconHTML('times-circle')}</span>${reason}`);
   },
 
   bounceLeft($elem) {