ascribe
/
onion
mirror of https://github.com/ascribe/onion.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #193 from ascribe/AG-162-stuck-piece-registration 

Hide button and spinner in form instead of replace
This commit is contained in:
Tim Daubenschütz 2016-04-21 16:02:29 +02:00
parent b26b38f5d9 abebbe2e51
commit 6b147cdef9
2 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/components/ascribe_buttons/form_submit_button.js
View File

@ -55,4 +55,4 @@ const FormSubmitButton = React.createClass({
}
});
export default FormSubmitButton;
export default FormSubmitButton;

25
js/components/ascribe_forms/form.js
View File

@ -3,6 +3,8 @@
import React from 'react';
import ReactAddons from 'react/addons';
import classNames from 'classnames';
import Button from 'react-bootstrap/lib/Button';
import AlertDismissable from './alert';
@ -206,21 +208,30 @@ let Form = React.createClass({
},
getButtons() {
if (this.state.submitted) {
return this.props.spinner;
}
if (this.props.buttons !== undefined) {
return this.props.buttons;
const { buttons, disabled, buttonSubmitText, spinner } = this.props;
const { submitted, edited } = this.state;
if (submitted || buttons !== undefined) {
return (
<div>
<div className={classNames({ 'hide': !submitted })}>
{spinner}
</div>
<div className={classNames({ 'hide': submitted })}>
{buttons}
</div>
</div>
);
}
if (this.state.edited && !this.props.disabled) {
if (edited && !disabled) {
return (
<div className="row" style={{margin: 0}}>
<p className="pull-right">
<Button
className="btn btn-default btn-sm ascribe-margin-1px"
type="submit">
{this.props.buttonSubmitText}
{buttonSubmitText}
</Button>
<Button
className="btn btn-danger btn-delete btn-sm ascribe-margin-1px"