mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 15:07:53 +02:00
Code Issues Releases Wiki Activity

common: merge admin & forum Page components

Browse Source 
Now both extend src/common/components/Page.tsx
Admin component is the exact same as common
Forum component extends common & adds one line
This commit is contained in:
David Sevilla Martin
2020-05-03 16:00:00 -04:00
parent c5f1e30855
commit bd2850d5ea
4 changed files with 43 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
js/src/admin/components/Page.tsx
View File

@@ -1,34 +1,3 @@
import Component from '../../common/Component';
import Page from '../../common/components/Page';
/**
* The `Page` component
*/
export default abstract class Page extends Component {
/**
* A class name to apply to the body while the route is active.
*/
bodyClass: string = '';
oninit(vnode) {
super.oninit(vnode);
if (this.bodyClass) {
$('#app').addClass(this.bodyClass);
}
}
oncreate(vnode) {
super.oncreate(vnode);
app.previous = app.current;
app.current = this;
app.modal.close();
}
onremove(vnode) {
super.onremove(vnode);
$('#app').removeClass(this.bodyClass);
}
}
export default Page;

6
js/src/common/Application.ts
View File

@@ -20,12 +20,13 @@ import Group from './models/Group';
import Notification from './models/Notification';
import Alert from './components/Alert';
import AlertManager from './components/AlertManager';
import Button from './components/Button';
import ModalManager from './components/ModalManager';
import Page from './components/Page';
import RequestErrorModal from './components/RequestErrorModal';
import flattenDeep from 'lodash/flattenDeep';
import AlertManager from './components/AlertManager';
export type ApplicationData = {
apiDocument: any;
@@ -107,6 +108,9 @@ export default abstract class Application {
modal!: ModalManager;
alerts!: AlertManager;
current?: Page;
previous?: Page;
load(payload) {
this.data = payload;
this.translator.locale = payload.locale;

34
js/src/common/components/Page.tsx Normal file
View File

@@ -0,0 +1,34 @@
import Component from '../../common/Component';
/**
* The `Page` component
*/
export default abstract class Page extends Component {
/**
* A class name to apply to the body while the route is active.
*/
bodyClass: string = '';
oninit(vnode) {
super.oninit(vnode);
app.previous = app.current;
app.current = this;
if (this.bodyClass) {
$('#app').addClass(this.bodyClass);
}
}
oncreate(vnode) {
super.oncreate(vnode);
app.modal.close();
}
onremove(vnode) {
super.onremove(vnode);
$('#app').removeClass(this.bodyClass);
}
}

30
js/src/forum/components/Page.tsx
View File

@@ -1,35 +1,9 @@
import Component from '../../common/Component';
/**
* The `Page` component
*/
export default abstract class Page extends Component {
/**
* A class name to apply to the body while the route is active.
*/
bodyClass: string = '';
oninit(vnode) {
super.oninit(vnode);
if (this.bodyClass) {
$('#app').addClass(this.bodyClass);
}
}
import CommonPage from '../../common/components/Page';
export default abstract class Page extends CommonPage {
oncreate(vnode) {
super.oncreate(vnode);
app.previous = app.current;
app.current = this;
app.drawer.hide();
app.modal.close();
}
onremove(vnode) {
super.onremove(vnode);
$('#app').removeClass(this.bodyClass);
}
}