mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 14:37:49 +02:00
Code Issues Releases Wiki Activity

Remove modal responsibility for loading UI; using loading button state

Browse Source
This commit is contained in:
Toby Zerner
2015-08-02 17:25:05 +09:30
parent 5876ee30ed
commit d44ffd1866
9 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,5 @@
import Modal from 'flarum/components/Modal';
import Button from 'flarum/components/Button';
/**
* The `ChangeEmailModal` component shows a modal dialog which allows the user
@@ -60,9 +61,12 @@ export default class ChangeEmailModal extends Modal {
disabled={this.loading}/>
</div>
<div className="Form-group">
<button type="submit" className="Button Button--primary Button--block" disabled={this.loading}>
{app.trans('core.save_changes')}
</button>
{Button.component({
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.save_changes')
})}
</div>
</div>
</div>

10
js/forum/src/components/ChangePasswordModal.js
View File

@@ -1,4 +1,5 @@
import Modal from 'flarum/components/Modal';
import Button from 'flarum/components/Button';
/**
* The `ChangePasswordModal` component shows a modal dialog which allows the
@@ -19,9 +20,12 @@ export default class ChangePasswordModal extends Modal {
<div className="Form Form--centered">
<p className="helpText">{app.trans('core.change_password_help')}</p>
<div className="Form-group">
<button type="submit" className="Button Button--primary Button--block" disabled={this.loading}>
{app.trans('core.send_password_reset_email')}
</button>
{Button.component({
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.send_password_reset_email')
})}
</div>
</div>
</div>

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

@@ -1,4 +1,5 @@
import Modal from 'flarum/components/Modal';
import Button from 'flarum/components/Button';
/**
* The `DeleteAccountModal` component shows a modal dialog which allows the user
@@ -44,11 +45,13 @@ export default class DeleteAccountModal extends Modal {
oninput={m.withAttr('value', this.confirmation)}/>
</div>
<div className="Form-group">
<button type="submit"
className="Button Button--primary Button--block"
disabled={this.loading || this.confirmation() !== 'DELETE'}>
Delete Account
</button>
{Button.component({
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
disabled: this.confirmation() !== 'DELETE',
children: app.trans('core.delete_account')
})}
</div>
</div>
</div>

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

@@ -1,5 +1,6 @@
import Modal from 'flarum/components/Modal';
import Alert from 'flarum/components/Alert';
import Button from 'flarum/components/Button';
/**
* The `ForgotPasswordModal` component displays a modal which allows the user to
@@ -65,9 +66,12 @@ export default class ForgotPasswordModal extends Modal {
disabled={this.loading} />
</div>
<div className="Form-group">
<button type="submit" className="Button Button--primary Button--block" disabled={this.loading}>
{app.trans('core.recover_password')}
</button>
{Button.component({
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.recover_password')
})}
</div>
</div>
</div>

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

@@ -2,6 +2,7 @@ import Modal from 'flarum/components/Modal';
import ForgotPasswordModal from 'flarum/components/ForgotPasswordModal';
import SignUpModal from 'flarum/components/SignUpModal';
import Alert from 'flarum/components/Alert';
import Button from 'flarum/components/Button';
/**
* The `LogInModal` component displays a modal dialog with a login form.
@@ -57,11 +58,12 @@ export default class LogInModal extends Modal {
</div>
<div className="Form-group">
<button className="Button Button--primary Button--block"
type="submit"
disabled={this.loading}>
Log In
</button>
{Button.component({
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.log_in')
})}
</div>
</div>
</div>,

12
js/forum/src/components/SignUpModal.js
View File

@@ -1,6 +1,7 @@
import Modal from 'flarum/components/Modal';
import LogInModal from 'flarum/components/LogInModal';
import avatar from 'flarum/helpers/avatar';
import Button from 'flarum/components/Button';
/**
* The `SignUpModal` component displays a modal dialog with a singup form.
@@ -88,11 +89,12 @@ export default class SignUpModal extends Modal {
</div>
<div className="Form-group">
<button className="Button Button--primary Button--block"
type="submit"
disabled={this.loading}>
{app.trans('core.sign_up')}
</button>
{Button.component({
className: 'Button Button--primary Button--block',
type: 'submit',
loading: this.loading,
children: app.trans('core.sign_up')
})}
</div>
</div>
)];