From d00e3628afabed095c1a9b1922cb8bcbbbeef39c Mon Sep 17 00:00:00 2001
From: George Stepanek <g.stepanek.nz@gmail.com>
Date: Wed, 13 Apr 2016 14:28:48 +1200
Subject: [PATCH] Fix the navbar links so control-clicking opens them in a new
 tab

---
 client/main.js                    | 18 +++++++++++++++---
 server/views/partials/navbar.jade |  6 +++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/client/main.js b/client/main.js
index b7ed7c9bd0..476e280681 100644
--- a/client/main.js
+++ b/client/main.js
@@ -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() {
       if (!main.chat.isOpen) {
@@ -350,7 +354,11 @@ $(document).ready(function() {
   var mapFilter = $('#map-filter');
   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);
 
@@ -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);
 
diff --git a/server/views/partials/navbar.jade b/server/views/partials/navbar.jade
index 5e527ddc8d..edbc4b72c0 100644
--- a/server/views/partials/navbar.jade
+++ b/server/views/partials/navbar.jade
@@ -8,15 +8,15 @@ nav.navbar.navbar-default.navbar-fixed-top.nav-height
     .collapse.navbar-collapse
         ul.nav.navbar-nav.navbar-right.hamburger-dropdown
             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
                 a(href='/map') Map
             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
                 a(href="//gitter.im/freecodecamp/freecodecamp" target="_blank") Chat
             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
                 a(href='/wiki', target='_blank') Wiki
             li