mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-10-23 04:36:08 +02:00
Code Issues Releases Wiki Activity

Extract AlertManagerState from AlertManager (#2163)

Browse Source
This commit is contained in:
Alexander Skvortsov
2020-06-30 18:06:59 -04:00
committed by GitHub
parent aaebd3581f
commit ea9d601338
12 changed files with 107 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/forum/components/ChangeEmailModal.js
View File

@@ -122,7 +122,7 @@ export default class ChangeEmailModal extends Modal {
onerror(error) {
if (error.status === 401) {
error.alert.props.children = app.translator.trans('core.forum.change_email.incorrect_password_message');
error.alert.children = app.translator.trans('core.forum.change_email.incorrect_password_message');
}
super.onerror(error);

13
js/src/forum/components/EditPostComposer.js
View File

@@ -1,5 +1,4 @@
import ComposerBody from './ComposerBody';
import Alert from '../../common/components/Alert';
import Button from '../../common/components/Button';
import icon from '../../common/helpers/icon';
@@ -101,13 +100,11 @@ export default class EditPostComposer extends ComposerBody {
app.alerts.dismiss(alert);
},
});
app.alerts.show(
(alert = new Alert({
type: 'success',
children: app.translator.trans('core.forum.composer_edit.edited_message'),
controls: [viewButton],
}))
);
alert = app.alerts.show({
type: 'success',
children: app.translator.trans('core.forum.composer_edit.edited_message'),
controls: [viewButton],
});
}
app.composer.hide();

2
js/src/forum/components/ForgotPasswordModal.js
View File

@@ -104,7 +104,7 @@ export default class ForgotPasswordModal extends Modal {
onerror(error) {
if (error.status === 404) {
error.alert.props.children = app.translator.trans('core.forum.forgot_password.not_found_message');
error.alert.children = app.translator.trans('core.forum.forgot_password.not_found_message');
}
super.onerror(error);

2
js/src/forum/components/LogInModal.js
View File

@@ -179,7 +179,7 @@ export default class LogInModal extends Modal {
onerror(error) {
if (error.status === 401) {
error.alert.props.children = app.translator.trans('core.forum.log_in.invalid_login_message');
error.alert.children = app.translator.trans('core.forum.log_in.invalid_login_message');
}
super.onerror(error);

13
js/src/forum/components/ReplyComposer.js
View File

@@ -1,5 +1,4 @@
import ComposerBody from './ComposerBody';
import Alert from '../../common/components/Alert';
import Button from '../../common/components/Button';
import icon from '../../common/helpers/icon';
import extractText from '../../common/utils/extractText';
@@ -104,13 +103,11 @@ export default class ReplyComposer extends ComposerBody {
app.alerts.dismiss(alert);
},
});
app.alerts.show(
(alert = new Alert({
type: 'success',
children: app.translator.trans('core.forum.composer_reply.posted_message'),
controls: [viewButton],
}))
);
alert = app.alerts.show({
type: 'success',
children: app.translator.trans('core.forum.composer_reply.posted_message'),
controls: [viewButton],
});
}
app.composer.hide();

11
js/src/forum/utils/UserControls.js
View File

@@ -1,4 +1,3 @@
import Alert from '../../common/components/Alert';
import Button from '../../common/components/Button';
import Separator from '../../common/components/Separator';
import EditUserModal from '../components/EditUserModal';
@@ -134,12 +133,10 @@ export default {
error: 'core.forum.user_controls.delete_error_message',
}[type];
app.alerts.show(
new Alert({
type,
children: app.translator.trans(message, { username, email }),
})
);
app.alerts.show({
type,
children: app.translator.trans(message, { username, email }),
});
},
/**