Skip to content

Commit

Permalink
Update for beta 15
Browse files Browse the repository at this point in the history
  • Loading branch information
imorland committed Dec 18, 2020
1 parent e23c8cb commit f02a3cf
Show file tree
Hide file tree
Showing 7 changed files with 68 additions and 38 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Build JavaScript assets

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@master
- uses: flarum/action-build@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ js/node_modules
vendor/
composer.lock
yarn.lock
js/dist
13 changes: 11 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,26 @@
],
"support": {
"issues": "https://github.com/FriendsOfFlarum/html-errors/issues",
"source": "https://github.com/FriendsOfFlarum/html-errors"
"source": "https://github.com/FriendsOfFlarum/html-errors",
"forum": "https://discuss.flarum.org/d/10784"
},
"homepage": "https://friendsofflarum.org",
"funding": [
{
"type": "website",
"url": "https://opencollective.com/fof/donate"
}
],
"require": {
"flarum/core": ">=0.1.0-beta.14 <0.1.0-beta.15"
"flarum/core": ">=0.1.0-beta.15 <0.1.0-beta.16"
},
"replace": {
"flagrow/html-errors": "*"
},
"extra": {
"flarum-extension": {
"title": "FoF HTML Errors",
"category": "formatting",
"icon": {
"name": "fas fa-exclamation-circle",
"backgroundColor": "#e74c3c",
Expand Down
6 changes: 3 additions & 3 deletions js/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 0 additions & 30 deletions js/src/admin/components/ErrorSettingsModal.js

This file was deleted.

35 changes: 35 additions & 0 deletions js/src/admin/components/ErrorSettingsPage.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import app from 'flarum/app';
import ExtensionPage from 'flarum/components/ExtensionPage';

// Keeping the old flagrow settings prefix because it's easier
const settingsPrefix = 'flagrow-html-errors.';
const translationPrefix = 'fof-html-errors.admin.settings.';

/* global m */

export default class ErrorSettingsModal extends ExtensionPage {
oninit(vnode) {
super.oninit(vnode);

this.setting = this.setting.bind(this);
}

content() {
return [
m('.container', [
m('.HTMLErrorsSettingsPage', [
[403, 404, 500, 503].map(
error => m('.Form-group', [
m('label', app.translator.trans(translationPrefix + 'error.' + error)),
m('textarea.FormControl', {
bidi: this.setting(settingsPrefix + 'custom' + error + 'ErrorHtml'),
placeholder: app.translator.trans(translationPrefix + 'placeholder.empty_for_default'),
}),
])
),
this.submitButton()
])
])
]
}
}
5 changes: 2 additions & 3 deletions js/src/admin/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import {extend} from 'flarum/extend';
import app from 'flarum/app';
import ErrorSettingsModal from './components/ErrorSettingsModal';
import ErrorSettingsPage from './components/ErrorSettingsPage';

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

0 comments on commit f02a3cf

Please sign in to comment.