mirror of
https://github.com/TryGhost/Ghost.git
synced 2025-01-20 22:42:53 -05:00
Reset shortcuts scope when leaving tags route
refs #6191, #6192 - adds additional safeguard to tags route to ensure keymaster scope doesn't get stuck in a non-default scope that may break shortcuts elsewhere
This commit is contained in:
parent
70a481be32
commit
78240e186b
1 changed files with 6 additions and 0 deletions
|
@ -1,3 +1,4 @@
|
||||||
|
/* global key */
|
||||||
import Ember from 'ember';
|
import Ember from 'ember';
|
||||||
import AuthenticatedRoute from 'ghost/routes/authenticated';
|
import AuthenticatedRoute from 'ghost/routes/authenticated';
|
||||||
import CurrentUserSettings from 'ghost/mixins/current-user-settings';
|
import CurrentUserSettings from 'ghost/mixins/current-user-settings';
|
||||||
|
@ -40,6 +41,7 @@ export default AuthenticatedRoute.extend(CurrentUserSettings, PaginationRoute, S
|
||||||
|
|
||||||
deactivate() {
|
deactivate() {
|
||||||
this._super(...arguments);
|
this._super(...arguments);
|
||||||
|
this.send('resetShortcutsScope');
|
||||||
this.send('resetPagination');
|
this.send('resetPagination');
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -95,6 +97,10 @@ export default AuthenticatedRoute.extend(CurrentUserSettings, PaginationRoute, S
|
||||||
|
|
||||||
newTag() {
|
newTag() {
|
||||||
this.transitionTo('settings.tags.new');
|
this.transitionTo('settings.tags.new');
|
||||||
|
},
|
||||||
|
|
||||||
|
resetShortcutsScope() {
|
||||||
|
key.setScope('default');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Add table
Reference in a new issue