github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-06-19 16:51:23 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix regression in admin routing in subdirectory. fixes #1606

Browse Source 
Because admin routing uses the "hash" strategy, the base path does not
need to be taken into account.
This commit is contained in:
Toby Zerner
2018-10-29 07:25:17 +10:30
parent a1948e7bb8
commit 104d3982fe
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
js/src/common/Application.js
View File

@ -150,13 +150,12 @@ export default class Application {
}); });
} }
mount() { mount(basePath = '') {
this.modal = m.mount(document.getElementById('modal'), <ModalManager/>); this.modal = m.mount(document.getElementById('modal'), <ModalManager/>);
this.alerts = m.mount(document.getElementById('alerts'), <AlertManager/>); this.alerts = m.mount(document.getElementById('alerts'), <AlertManager/>);
this.drawer = new Drawer(); this.drawer = new Drawer();
const basePath = this.forum.attribute('basePath');
m.route( m.route(
document.getElementById('content'), document.getElementById('content'),
basePath + '/', basePath + '/',

2
js/src/forum/ForumApplication.js
View File

@ -96,7 +96,7 @@ export default class ForumApplication extends Application {
this.composer = m.mount(document.getElementById('composer'), Composer.component()); this.composer = m.mount(document.getElementById('composer'), Composer.component());
m.route.mode = 'pathname'; m.route.mode = 'pathname';
super.mount(); super.mount(this.forum.attribute('basePath'));
alertEmailConfirmation(this); alertEmailConfirmation(this);