Skip to content

Commit f02a3cf

Browse files
committed
Update for beta 15
1 parent e23c8cb commit f02a3cf

File tree

7 files changed

+68
-38
lines changed

7 files changed

+68
-38
lines changed

.github/workflows/build.yml

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
name: Build JavaScript assets
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
8+
jobs:
9+
build:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- uses: actions/checkout@master
14+
- uses: flarum/action-build@master
15+
env:
16+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ js/node_modules
22
vendor/
33
composer.lock
44
yarn.lock
5+
js/dist

composer.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -19,17 +19,26 @@
1919
],
2020
"support": {
2121
"issues": "https://github.com/FriendsOfFlarum/html-errors/issues",
22-
"source": "https://github.com/FriendsOfFlarum/html-errors"
22+
"source": "https://github.com/FriendsOfFlarum/html-errors",
23+
"forum": "https://discuss.flarum.org/d/10784"
2324
},
25+
"homepage": "https://friendsofflarum.org",
26+
"funding": [
27+
{
28+
"type": "website",
29+
"url": "https://opencollective.com/fof/donate"
30+
}
31+
],
2432
"require": {
25-
"flarum/core": ">=0.1.0-beta.14 <0.1.0-beta.15"
33+
"flarum/core": ">=0.1.0-beta.15 <0.1.0-beta.16"
2634
},
2735
"replace": {
2836
"flagrow/html-errors": "*"
2937
},
3038
"extra": {
3139
"flarum-extension": {
3240
"title": "FoF HTML Errors",
41+
"category": "formatting",
3342
"icon": {
3443
"name": "fas fa-exclamation-circle",
3544
"backgroundColor": "#e74c3c",

js/package-lock.json

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/src/admin/components/ErrorSettingsModal.js

-30
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import app from 'flarum/app';
2+
import ExtensionPage from 'flarum/components/ExtensionPage';
3+
4+
// Keeping the old flagrow settings prefix because it's easier
5+
const settingsPrefix = 'flagrow-html-errors.';
6+
const translationPrefix = 'fof-html-errors.admin.settings.';
7+
8+
/* global m */
9+
10+
export default class ErrorSettingsModal extends ExtensionPage {
11+
oninit(vnode) {
12+
super.oninit(vnode);
13+
14+
this.setting = this.setting.bind(this);
15+
}
16+
17+
content() {
18+
return [
19+
m('.container', [
20+
m('.HTMLErrorsSettingsPage', [
21+
[403, 404, 500, 503].map(
22+
error => m('.Form-group', [
23+
m('label', app.translator.trans(translationPrefix + 'error.' + error)),
24+
m('textarea.FormControl', {
25+
bidi: this.setting(settingsPrefix + 'custom' + error + 'ErrorHtml'),
26+
placeholder: app.translator.trans(translationPrefix + 'placeholder.empty_for_default'),
27+
}),
28+
])
29+
),
30+
this.submitButton()
31+
])
32+
])
33+
]
34+
}
35+
}

js/src/admin/index.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import {extend} from 'flarum/extend';
21
import app from 'flarum/app';
3-
import ErrorSettingsModal from './components/ErrorSettingsModal';
2+
import ErrorSettingsPage from './components/ErrorSettingsPage';
43

54
app.initializers.add('fof-html-errors', app => {
6-
app.extensionSettings['fof-html-errors'] = () => app.modal.show(ErrorSettingsModal);
5+
app.extensionData.for('fof-html-errors').registerPage(ErrorSettingsPage);
76
});

0 commit comments

Comments
 (0)