Fixed hotkeys not resetting on presenter change
This commit is contained in:
parent
169d5f7068
commit
5dfa011d5a
3 changed files with 8 additions and 3 deletions
1
TODO
1
TODO
|
@ -109,7 +109,6 @@ refactors:
|
|||
miscellaneous:
|
||||
- use 1 token for logins, so that session isn't killed
|
||||
- endless pager should include information about page number
|
||||
- fix mouse trap hotkeys when leaving page
|
||||
- add hotkeys for focusing items in top navigation
|
||||
- add ability to select tags text in tag input
|
||||
- pasting tags should "soft-add" latest word in clipboard to input
|
||||
|
|
|
@ -18,9 +18,14 @@ App.Keyboard = function(mousetrap) {
|
|||
};
|
||||
}
|
||||
|
||||
function reset() {
|
||||
mousetrap.reset();
|
||||
}
|
||||
|
||||
return {
|
||||
keydown: keydown,
|
||||
keyup: keyup,
|
||||
reset: reset,
|
||||
};
|
||||
};
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
var App = App || {};
|
||||
|
||||
App.PresenterManager = function(jQuery, topNavigationPresenter) {
|
||||
App.PresenterManager = function(jQuery, topNavigationPresenter, keyboard) {
|
||||
|
||||
var lastContentPresenter = null;
|
||||
var $spinner;
|
||||
|
@ -34,6 +34,7 @@ App.PresenterManager = function(jQuery, topNavigationPresenter) {
|
|||
}, 100);
|
||||
|
||||
if (lastContentPresenter === null || lastContentPresenter.name !== presenter.name) {
|
||||
keyboard.reset();
|
||||
topNavigationPresenter.changeTitle(null);
|
||||
presenter.init.call(presenter, args, contentPresenterLoaded);
|
||||
lastContentPresenter = presenter;
|
||||
|
@ -67,4 +68,4 @@ App.PresenterManager = function(jQuery, topNavigationPresenter) {
|
|||
|
||||
};
|
||||
|
||||
App.DI.registerSingleton('presenterManager', ['jQuery', 'topNavigationPresenter'], App.PresenterManager);
|
||||
App.DI.registerSingleton('presenterManager', ['jQuery', 'topNavigationPresenter', 'keyboard'], App.PresenterManager);
|
||||
|
|
Loading…
Reference in a new issue