From 65600cb370e2f7c296140f3246c81630bddf9437 Mon Sep 17 00:00:00 2001 From: Vince Cooley Date: Sat, 30 Apr 2016 23:11:07 -0500 Subject: [PATCH] Modals now close map, wiki, and chat asides when they are displayed Changed aside tags to select by class or id --- client/commonFramework/bindings.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/client/commonFramework/bindings.js b/client/commonFramework/bindings.js index 18b98fb29e..36e1d5d9f4 100644 --- a/client/commonFramework/bindings.js +++ b/client/commonFramework/bindings.js @@ -150,6 +150,11 @@ window.common = (function(global) { window.ga('send', 'event', 'Challenge', 'load', common.gaName); } + $('.modal').on('show.bs.modal', function() { + $('.gitter-chat-embed, .wiki-aside, .map-aside') + .addClass('is-collapsed'); + }); + $('#complete-courseware-dialog').on('hidden.bs.modal', function() { if (common.editor.focus) { common.editor.focus(); @@ -176,6 +181,15 @@ window.common = (function(global) { $('#complete-courseware-dialog').modal('show'); }); + $('#show-solution').on('click', function() { + $('#complete-courseware-dialog').modal('hide'); + $('#nav-wiki-btn').click(); + }); + + $('#challenge-help-btn').on('click', function() { + $('.wiki-aside, .map-aside, #chat-embed-main').addClass('is-collapsed'); + }); + $('#help-ive-found-a-bug-wiki-article').on('click', function() { window.open( 'https://github.com/FreeCodeCamp/FreeCodeCamp/wiki/' +