Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #362 from ZogStriP/repeated-clicks 

Repeated click on header icons should close popped out dropdowns
This commit is contained in:
Robin Ward 2013-03-05 07:29:56 -08:00
parent 0c5ca30188 c72f65879f
commit 6edabdfec1
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/assets/javascripts/discourse/views/header_view.js
View File

@ -17,31 +17,37 @@ Discourse.HeaderView = Discourse.View.extend({
topicBinding: 'Discourse.router.topicController.content', topicBinding: 'Discourse.router.topicController.content',
showDropdown: function($target) { showDropdown: function($target) {
var $dropdown, $html, $li, $ul, elementId, hideDropdown, var elementId = $target.data('dropdown') || $target.data('notifications'),
_this = this; $dropdown = $("#" + elementId),
elementId = $target.data('dropdown') || $target.data('notifications'); $li = $target.closest('li'),
$dropdown = $("#" + elementId); $ul = $target.closest('ul'),
$li = $target.closest('li'); $html = $('html');
$ul = $target.closest('ul');
$li.addClass('active'); var hideDropdown = function() {
$('li', $ul).not($li).removeClass('active');
$('.d-dropdown').not($dropdown).fadeOut('fast');
$dropdown.fadeIn('fast');
$dropdown.find('input[type=text]').focus().select();
$html = $('html');
hideDropdown = function() {
$dropdown.fadeOut('fast'); $dropdown.fadeOut('fast');
$li.removeClass('active'); $li.removeClass('active');
$html.data('hide-dropdown', null); $html.data('hide-dropdown', null);
return $html.off('click.d-dropdown'); return $html.off('click.d-dropdown');
}; };
// if a dropdown is active and the user clics on it, close it
if($li.hasClass('active')) { return hideDropdown(); }
// otherwhise, mark it as active
$li.addClass('active');
// hide the other dropdowns
$('li', $ul).not($li).removeClass('active');
$('.d-dropdown').not($dropdown).fadeOut('fast');
// fade it fast
$dropdown.fadeIn('fast');
// autofocus any text input field
$dropdown.find('input[type=text]').focus().select();
$html.on('click.d-dropdown', function(e) { $html.on('click.d-dropdown', function(e) {
if ($(e.target).closest('.d-dropdown').length > 0) { return $(e.target).closest('.d-dropdown').length > 0 ? true : hideDropdown();
return true;
}
return hideDropdown();
}); });
$html.data('hide-dropdown', hideDropdown); $html.data('hide-dropdown', hideDropdown);
return false; return false;
}, },