aboutsummaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-17 04:42:41 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-03-17 04:42:41 +0000
commitfafdc36ad1211620d21344737286e7b3174f0ee6 (patch)
treefede6cf8985354df4a742debec41b361995c1b4d /js
parent825cc40036438c4a1e1f2f9d31670abee591752a (diff)
downloadelgg-fafdc36ad1211620d21344737286e7b3174f0ee6.tar.gz
elgg-fafdc36ad1211620d21344737286e7b3174f0ee6.tar.bz2
Fixes #3094, Refs #3111. Clicking outside a popup closes the visible popups.
git-svn-id: http://code.elgg.org/elgg/trunk@8750 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'js')
-rw-r--r--js/lib/ui.js49
1 files changed, 48 insertions, 1 deletions
diff --git a/js/lib/ui.js b/js/lib/ui.js
index 0600eb0cb..5451dce73 100644
--- a/js/lib/ui.js
+++ b/js/lib/ui.js
@@ -61,6 +61,7 @@ elgg.ui.toggles = function(event) {
*/
elgg.ui.popsUp = function(event) {
event.preventDefault();
+ event.stopPropagation();
var target = elgg.getUrlFragment($(this).toggleClass('elgg-state-active').attr('href'));
var $target = $(target);
@@ -84,16 +85,62 @@ elgg.ui.popsUp = function(event) {
if (!options) {
return;
}
-
+
// hide if already open
if ($target.is(':visible')) {
$target.fadeOut();
+ $('body').die('click', elgg.ui.popupClose);
return;
}
$target.appendTo('body')
.fadeIn()
.position(options);
+
+ $('body')
+ .die('click', elgg.ui.popupClose)
+ .live('click', elgg.ui.popupClose);
+}
+
+/**
+ * Catches clicks that aren't in a popup and closes all popups.
+ */
+elgg.ui.popupClose = function(event) {
+ event.preventDefault();
+ event.stopPropagation();
+
+ $eventTarget = $(event.target);
+ var inTarget = false;
+ var $popups = $('[rel=popup]');
+
+ // if the click event target isn't in a popup target, fade all of them out.
+ $popups.each(function(i, e) {
+ var target = elgg.getUrlFragment($(e).attr('href')) + ':visible';
+ var $target = $(target);
+
+ if (!$target.is(':visible')) {
+ return;
+ }
+
+ // didn't click inside the target
+ if ($eventTarget.closest(target).length > 0) {
+ inTarget = true;
+ return false;
+ }
+ });
+
+ if (!inTarget) {
+ $popups.each(function(i, e) {
+ var $e = $(e);
+ var $target = $(elgg.getUrlFragment($e.attr('href')) + ':visible');
+ if ($target.length > 0) {
+ $target.fadeOut();
+ $e.removeClass('elgg-state-active');
+ }
+ });
+
+ $('body').die('click', elgg.ui.popClose);
+ }
}
/**