Skip to content

Commit 81475c0

Browse files
committed
Squashed commit of the following:
commit fb5e82cea930b011792983c7d1cc9f6ecacc7dd4 Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Wed Nov 16 12:28:10 2016 -0500 add server side rendering, untested commit 5c60fb30c46ea49a8d9a0ecb56f39ec778464a8b Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Tue Nov 15 18:26:06 2016 -0500 add redux-form bandage post react update, should probably update to redux-form 6 at some point commit 057b5871e7137179abc93f7821a9690f0ea52c92 Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Tue Nov 15 16:30:09 2016 -0500 remove passing jsFiles and cssFiles to PreviewFrame, fix rendering bug commit 88c56fd36d3a8d88902c79642171988ce37825f2 Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Tue Nov 15 16:21:59 2016 -0500 code cleanup, untested commit 82e5dcf8bca461892f1daf06d38f1eaebe72983f Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Tue Nov 15 15:53:50 2016 -0500 update react and react router, fix a few bugs in rendering code, add ability to parse inline js and css commit e02f4b67803ea45328eff4e53659222f3149964c Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Tue Nov 15 14:43:38 2016 -0500 add almost full code to create preview html correctly, untested commit 12f61b2a1aed4607fab24d01572b647ca6210262 Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Wed Nov 2 17:09:26 2016 -0400 refactor some of the preview html generation code commit 111825846703d5c8959cb18795a3aadb7ebe505c Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Wed Nov 2 11:06:36 2016 -0400 add comments as plan of action commit 1cc2cf5203674732b4057382f1937de38b687078 Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Thu Oct 27 19:34:55 2016 -0400 add href parsing commit e67189298cda9b70645f454ecd541a363980f0e4 Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Thu Oct 27 10:48:36 2016 -0400 continue parsing html commit 1458fb940a15a3dc5d74890211a3073e920b84b8 Author: Cassie Tarakajian <ctarakajian@gmail.com> Date: Wed Oct 26 17:40:31 2016 -0400 start to add html parsing
1 parent ced885d commit 81475c0

15 files changed

+377
-238
lines changed

client/modules/IDE/components/LoginForm.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { PropTypes } from 'react';
2+
import { domOnlyProps } from '../../../utils/reduxFormUtils';
23

34
function LoginForm(props) {
45
const { fields: { email, password }, handleSubmit, submitting, pristine } = props;
@@ -10,7 +11,7 @@ function LoginForm(props) {
1011
aria-label="email"
1112
type="text"
1213
placeholder="Email"
13-
{...email}
14+
{...domOnlyProps(email)}
1415
/>
1516
{email.touched && email.error && <span className="form-error">{email.error}</span>}
1617
</p>
@@ -20,7 +21,7 @@ function LoginForm(props) {
2021
aria-label="password"
2122
type="password"
2223
placeholder="Password"
23-
{...password}
24+
{...domOnlyProps(password)}
2425
/>
2526
{password.touched && password.error && <span className="form-error">{password.error}</span>}
2627
</p>

client/modules/IDE/components/NewFileForm.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { PropTypes } from 'react';
2+
import { domOnlyProps } from '../../../utils/reduxFormUtils';
23

34
class NewFileForm extends React.Component {
45
constructor(props) {
@@ -21,7 +22,7 @@ class NewFileForm extends React.Component {
2122
type="text"
2223
placeholder="Name"
2324
ref="fileName"
24-
{...name}
25+
{...domOnlyProps(name)}
2526
/>
2627
<input type="submit" value="Add File" aria-label="add file" />
2728
{name.touched && name.error && <span className="form-error">{name.error}</span>}

client/modules/IDE/components/NewFolderForm.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { PropTypes } from 'react';
2+
import { domOnlyProps } from '../../../utils/reduxFormUtils';
23

34
class NewFolderForm extends React.Component {
45
constructor(props) {
@@ -21,7 +22,7 @@ class NewFolderForm extends React.Component {
2122
type="text"
2223
placeholder="Name"
2324
ref="fileName"
24-
{...name}
25+
{...domOnlyProps(name)}
2526
/>
2627
<input type="submit" value="Add Folder" aria-label="add folder" />
2728
</form>

client/modules/IDE/components/NewPasswordForm.jsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React, { PropTypes } from 'react';
2+
import { domOnlyProps } from '../../../utils/reduxFormUtils';
23

34
function NewPasswordForm(props) {
45
const { fields: { password, confirmPassword }, handleSubmit, submitting, invalid, pristine } = props;
@@ -10,7 +11,7 @@ function NewPasswordForm(props) {
1011
aria-label="password"
1112
type="password"
1213
placeholder="Password"
13-
{...password}
14+
{...domOnlyProps(password)}
1415
/>
1516
{password.touched && password.error && <span className="form-error">{password.error}</span>}
1617
</p>
@@ -20,7 +21,7 @@ function NewPasswordForm(props) {
2021
type="password"
2122
placeholder="Confirm Password"
2223
aria-label="confirm password"
23-
{...confirmPassword}
24+
{...domOnlyProps(confirmPassword)}
2425
/>
2526
{confirmPassword.touched && confirmPassword.error && <span className="form-error">{confirmPassword.error}</span>}
2627
</p>

0 commit comments

Comments
 (0)