gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Map and chat buttons toggle asides

Browse Source
This commit is contained in:
Alister N. Mada
2016-02-07 16:51:57 +07:00
parent 5571c668d2
commit 0465923e64
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
client/main.js
View File

@ -96,7 +96,7 @@ main = (function(main, global) {
}); });
$('#nav-chat-btn').on('click', showMainChat); $('#nav-chat-btn').on('click', toggleMainChat);
function showMainChat() { function showMainChat() {
if (!main.chat.isOpen) { if (!main.chat.isOpen) {
@ -106,10 +106,10 @@ main = (function(main, global) {
function collapseMainChat() { function collapseMainChat() {
$('#chat-embed-main').addClass('is-collapsed'); $('#chat-embed-main').addClass('is-collapsed');
document.activeElement.blur();
} }
// keyboard shortcuts: open main chat function toggleMainChat() {
Mousetrap.bind('g c', function() {
var isCollapsed = $('#chat-embed-main').hasClass('is-collapsed'); var isCollapsed = $('#chat-embed-main').hasClass('is-collapsed');
if (isCollapsed) { if (isCollapsed) {
@ -117,7 +117,10 @@ main = (function(main, global) {
} else { } else {
collapseMainChat(); collapseMainChat();
} }
}); }
// keyboard shortcuts: open main chat
Mousetrap.bind('g c', toggleMainChat);
}); });
return main; return main;
@ -344,7 +347,7 @@ $(document).ready(function() {
var mapFilter = $('#map-filter'); var mapFilter = $('#map-filter');
var mapShowAll = $('#showAll'); var mapShowAll = $('#showAll');
$('#nav-map-btn').on('click', showMap); $('#nav-map-btn').on('click', toggleMap);
$('.map-aside-action-collapse').on('click', collapseMap); $('.map-aside-action-collapse').on('click', collapseMap);
@ -360,6 +363,17 @@ $(document).ready(function() {
function collapseMap() { function collapseMap() {
$('.map-aside').addClass('is-collapsed'); $('.map-aside').addClass('is-collapsed');
document.activeElement.blur();
}
function toggleMap() {
var isCollapsed = $('.map-aside').hasClass('is-collapsed');
if (isCollapsed) {
showMap();
} else {
collapseMap();
}
} }
$('#accordion').on('show.bs.collapse', function(e) { $('#accordion').on('show.bs.collapse', function(e) {
@ -480,13 +494,5 @@ $(document).ready(function() {
window.Mousetrap.bind('esc', clearMapFilter); window.Mousetrap.bind('esc', clearMapFilter);
// keyboard shortcuts: open map // keyboard shortcuts: open map
window.Mousetrap.bind('g m', function() { window.Mousetrap.bind('g m', toggleMap);
var isCollapsed = $('.map-aside').hasClass('is-collapsed');
if (isCollapsed) {
showMap();
} else {
collapseMap();
}
});
}); });