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

Merge pull request #8082 from george-stepanek/fix/navbar-control-click-behaviour

Browse Source 
Fix the navbar links so control-clicking opens them in a new tab
This commit is contained in:
Justin Richardsson
2016-04-15 20:15:46 -04:00
parent d11066c944 d00e3628af
commit 5ab83d3dc9
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
client/main.js
View File

@ -97,7 +97,11 @@ main = (function(main, global) {
}); });
$('#nav-chat-btn').on('click', toggleMainChat); $('#nav-chat-btn').on('click', function(event) {
if (!(event.ctrlKey || event.metaKey)) {
toggleMainChat();
}
});
function showMainChat() { function showMainChat() {
if (!main.chat.isOpen) { if (!main.chat.isOpen) {
@ -350,7 +354,11 @@ $(document).ready(function() {
var mapFilter = $('#map-filter'); var mapFilter = $('#map-filter');
var mapShowAll = $('#showAll'); var mapShowAll = $('#showAll');
$('#nav-map-btn').on('click', toggleMap); $('#nav-map-btn').on('click', function(event) {
if (!(event.ctrlKey || event.metaKey)) {
toggleMap();
}
});
$('.map-aside-action-collapse').on('click', collapseMap); $('.map-aside-action-collapse').on('click', collapseMap);
@ -381,7 +389,11 @@ $(document).ready(function() {
} }
} }
$('#nav-wiki-btn').on('click', toggleWiki); $('#nav-wiki-btn').on('click', function(event) {
if (!(event.ctrlKey || event.metaKey)) {
toggleWiki();
}
});
$('.wiki-aside-action-collapse').on('click', collapseWiki); $('.wiki-aside-action-collapse').on('click', collapseWiki);

6
server/views/partials/navbar.jade
View File

@ -8,15 +8,15 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
.collapse.navbar-collapse .collapse.navbar-collapse
ul.nav.navbar-nav.navbar-right.hamburger-dropdown ul.nav.navbar-nav.navbar-right.hamburger-dropdown
li.hidden-xs li.hidden-xs
a#nav-map-btn(href='#' onclick='return false') Map a#nav-map-btn(href='/map' onclick='if (!(event.ctrlKey || event.metaKey)) {return false;}') Map
li.visible-xs li.visible-xs
a(href='/map') Map a(href='/map') Map
li.hidden-xs li.hidden-xs
a#nav-chat-btn(href='#' onclick="return false") Chat a#nav-chat-btn(href='//gitter.im/freecodecamp/freecodecamp' onclick="if (!(event.ctrlKey || event.metaKey)) {return false;}") Chat
li.visible-xs li.visible-xs
a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat
li.hidden-xs li.hidden-xs
a#nav-wiki-btn(href='#' onclick='return false') Wiki a#nav-wiki-btn(href='/wiki' onclick='if (!(event.ctrlKey || event.metaKey)) {return false;}') Wiki
li.visible-xs li.visible-xs
a(href='/wiki', target='_blank') Wiki a(href='/wiki', target='_blank') Wiki
li li