From a3bc5d20374850764c6742e7dfc72784dbb2314f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Thu, 26 Feb 2015 10:08:48 -0500 Subject: [PATCH] fixing bug where the nav dropdown didn't close when a chat was opened --- public/src/app.js | 2 +- public/src/modules/chat.js | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 1cc122e8ee..530ff81732 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -459,7 +459,7 @@ app.cacheBuster = null; } function collapseNavigationOnClick() { - $('#main-nav a, #user-control-list a, #logged-out-menu li a, #logged-in-menu .visible-xs').off('click').on('click', function() { + $('#nav-dropdown').off('click').on('click', '#main-nav a, #user-control-list a, #logged-out-menu li a, #logged-in-menu .visible-xs, #chat-list a', function() { if($('.navbar .navbar-collapse').hasClass('in')) { $('.navbar-header button').click(); } diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index abc1bb58be..7dd76874e9 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -52,10 +52,6 @@ define('chat', ['taskbar', 'string', 'sounds', 'forum/chats'], function(taskbar, } else { ajaxify.go('chats/' + utils.slugify(userObj.username)); } - /*javascript:app.openChat(\'' + - userObj.username + - '\', ' + userObj.uid + - ');*/ }); })(userObj); }