From ede9ea460629a044241c713a62e4de74c62d9d9a Mon Sep 17 00:00:00 2001
From: mseancole <msean.cole@gmail.com>
Date: Thu, 16 Jul 2015 17:15:45 -0400
Subject: [PATCH] fix(collapse): fix occasional flickering

- Fixes occasional flickering that can happen

Closes #3804
Fixes #3801
---
 src/collapse/collapse.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/collapse/collapse.js b/src/collapse/collapse.js
index 8f24d29ba7..74b6d4a3bc 100644
--- a/src/collapse/collapse.js
+++ b/src/collapse/collapse.js
@@ -17,6 +17,10 @@ angular.module('ui.bootstrap.collapse', [])
         }
 
         function collapse() {
+          if(! element.hasClass('collapse') && ! element.hasClass('in')) {
+            return collapseDone();
+          }
+
           element
             // IMPORTANT: The height must be set before adding "collapsing" class.
             // Otherwise, the browser attempts to animate from height 0 (in