From 5500e592580668e2b1f9e2c328cf35cedd67417d Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Sun, 24 Jan 2016 16:12:59 -0500 Subject: [PATCH 1/2] Added mousetrap to enable keyboard shortcuts --- bower.json | 3 ++- gulpfile.js | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/bower.json b/bower.json index 361ecbf7bc..58e62a0769 100644 --- a/bower.json +++ b/bower.json @@ -23,6 +23,7 @@ "rxjs": "~4.0.6", "CodeMirror": "~5.8.0", "chai": "~3.4.1", - "clipboard": "~1.5.5" + "clipboard": "~1.5.5", + "mousetrap": "~1.5.3" } } diff --git a/gulpfile.js b/gulpfile.js index 45e64095bf..5069c1bca0 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -99,6 +99,7 @@ var paths = { 'public/bower_components/bootstrap/dist/js/bootstrap.min.js', 'public/bower_components/d3/d3.min.js', 'public/bower_components/moment/min/moment.min.js', + 'public/bower_components/mousetrap/mousetrap.min.js', 'public/bower_components/lightbox2/dist/js/lightbox.min.js', 'public/bower_components/rxjs/dist/rx.all.min.js' ], From db8c0342c3fc776f07cc72f6b190ae9952db754a Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Sun, 24 Jan 2016 16:14:26 -0500 Subject: [PATCH 2/2] Added key shortcuts to open/close chat and map g c = toggle chat g m = togggle map --- client/main.js | 43 +++++++++++++++++++++++++++++++++++++------ 1 file changed, 37 insertions(+), 6 deletions(-) diff --git a/client/main.js b/client/main.js index 58ad57883a..1463a98858 100644 --- a/client/main.js +++ b/client/main.js @@ -95,11 +95,27 @@ main = (function(main) { }); - $('#nav-chat-btn').on('click', function() { - if (!main.chat.isOpen) { + $('#nav-chat-btn').on('click', showMainChat); + function showMainChat() { + if (!main.chat.isOpen) { main.chat.mainChat.toggleChat(true); } + } + + function collapseMainChat() { + $('#chat-embed-main').addClass('is-collapsed'); + } + + // keyboard shortcuts: open main chat + Mousetrap.bind('g c', function() { + var isCollapsed = $('#chat-embed-main').hasClass('is-collapsed'); + + if (isCollapsed) { + showMainChat(); + } else { + collapseMainChat(); + } }); }); @@ -287,7 +303,11 @@ $(document).ready(function() { } // map - $('#nav-map-btn').on('click', () => { + $('#nav-map-btn').on('click', showMap); + + $('.map-aside-action-collapse').on('click', collapseMap); + + function showMap() { if (!main.isMapAsideLoad) { var mapAside = $('