Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Opening panels by keyboard should respect closing

This commit is contained in:
Robin Ward 2015-08-31 14:51:38 -04:00
parent ca017facf2
commit e5911e7fc4
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/controllers/header.js.es6
View File

@ -18,6 +18,11 @@ const HeaderController = Ember.Controller.extend({
actions: { actions: {
toggleMenuPanel(visibleProp) {
this.toggleProperty(visibleProp);
this.appEvents.trigger('dropdowns:closeAll');
},
toggleStar() { toggleStar() {
const topic = this.get('topic'); const topic = this.get('topic');
if (topic) topic.toggleStar(); if (topic) topic.toggleStar();

7
app/assets/javascripts/discourse/lib/keyboard-shortcuts.js.es6
View File

@ -65,6 +65,7 @@ export default {
this.searchService = this.container.lookup('search-service:main'); this.searchService = this.container.lookup('search-service:main');
this.appEvents = this.container.lookup('app-events:main');
_.each(PATH_BINDINGS, this._bindToPath, this); _.each(PATH_BINDINGS, this._bindToPath, this);
_.each(CLICK_BINDINGS, this._bindToClick, this); _.each(CLICK_BINDINGS, this._bindToClick, this);
@ -169,15 +170,15 @@ export default {
}, },
showSearch() { showSearch() {
this.container.lookup('controller:header').toggleProperty('searchVisible'); this.container.lookup('controller:header').send('toggleMenuPanel', 'searchVisible');
}, },
toggleHamburgerMenu() { toggleHamburgerMenu() {
this.container.lookup('controller:header').toggleProperty('hamburgerVisible'); this.container.lookup('controller:header').send('toggleMenuPanel', 'hamburgerVisible');
}, },
showCurrentUser() { showCurrentUser() {
this.container.lookup('controller:header').toggleProperty('userMenuVisible'); this.container.lookup('controller:header').send('toggleMenuPanel', 'userMenuVisible');
}, },
showHelpModal() { showHelpModal() {