From bf6a4cd00ba8ddf6e1f5ef314289bdd85c441b61 Mon Sep 17 00:00:00 2001
From: "Gabriel \"_|Nix|_\" Schulhof" <gabriel.schulhof@intel.com>
Date: Thu, 11 Oct 2012 05:43:26 -0700
Subject: [PATCH] Merge pull request #5145 from jerone/master

Opening popup from within a listview does not restore button state
---
 js/widgets/popup.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/js/widgets/popup.js b/js/widgets/popup.js
index c60dd8e15d3..9a2e91911e7 100644
--- a/js/widgets/popup.js
+++ b/js/widgets/popup.js
@@ -802,6 +802,11 @@ define( [ "jquery",
 
 		//remove after delay
 		setTimeout( function() {
+			// Check if we are in a listview
+			var $parent = $link.parent().parent();
+			if ($parent.hasClass("ui-li")) {
+				$link = $parent.parent();
+			}
 			$link.removeClass( $.mobile.activeBtnClass );
 		}, 300 );
 	};