From f663ec6afc39ee3a58264ac676dc5c0b2b90b747 Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Tue, 27 Sep 2016 11:57:35 -0400 Subject: [PATCH] Finish update for latest React, Bootstrap, jQuery versions --- js/AccountsTab.js | 38 ++++++++++++++++++++++---------------- static/index.html | 6 +++--- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/js/AccountsTab.js b/js/AccountsTab.js index 3a7478b..131d795 100644 --- a/js/AccountsTab.js +++ b/js/AccountsTab.js @@ -8,6 +8,7 @@ var Col = ReactBootstrap.Col; var Form = ReactBootstrap.Form; var FormGroup = ReactBootstrap.FormGroup; var FormControl = ReactBootstrap.FormControl; +var Checkbox = ReactBootstrap.Checkbox; var ControlLabel = ReactBootstrap.ControlLabel; var Button = ReactBootstrap.Button; var ButtonGroup = ReactBootstrap.ButtonGroup; @@ -212,12 +213,15 @@ const DeleteAccountModal = React.createClass({ parentAccount = "and any child accounts will be re-parented to: " + this.props.account_map[parentAccountId].Name; var warningString = "I understand that deleting this account cannot be undone and that all transactions " + parentAccount; - checkbox = ( - + + - {warningString} + onClick={this.handleCheckboxClick}> + {warningString} + + ); } var warning = []; @@ -229,9 +233,9 @@ const DeleteAccountModal = React.createClass({ return ( + show={this.props.show} + onHide={this.handleCancel} + ref="modal"> Delete Account @@ -239,15 +243,17 @@ const DeleteAccountModal = React.createClass({ {warning}
- Delete Account - - {checkbox} + Delete Account + + + + {checkbox}
diff --git a/static/index.html b/static/index.html index 2482cc2..9e4e78b 100644 --- a/static/index.html +++ b/static/index.html @@ -2,12 +2,12 @@ MoneyGo - - + + - +