Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ notifications:
node_js:
- stable
script:
- npm run generate
- npm run rush-install
- npm run tools-build
- npm run source-build
- npm test
15 changes: 6 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,24 @@
"name": "@simplr/react-forms-repo",
"private": true,
"scripts": {
"generate": "rush generate",
"tools-build": "npm run rush-tools -- run gulp-build -e @simplr/mvdir",
"source-build": "npm run rush-tools -- run build -e @simplr/mvdir",
"test": "npm run rush-tools -- run test -e @simplr/mvdir",
"rush-install": "rush install",
"tools-build": "npm run rush-tools -- run -s gulp-build -e @simplr/mvdir",
"source-build": "npm run rush-tools -- run -s build -e @simplr/mvdir",
"test": "npm run rush-tools -- run -s test -e @simplr/mvdir",
"publish": "npm run rush-tools -- publish --access public",
"rush-tools": "ts-node ./tools/rush-tools.ts"
},
"devDependencies": {
"@microsoft/rush": "^3.0.11",
"@microsoft/rush-lib": "^3.0.11",
"@types/shelljs": "^0.7.2",
"@types/yargs": "^8.0.0",
"mz": "^2.6.0",
"shelljs": "^0.7.8",
"ts-node": "^3.1.0",
"typescript": "^2.4.1",
"yargs": "^8.0.2"
},
"dependencies": {
"@microsoft/ts-command-line": "^2.0.2",
"@types/semver": "^5.3.32",
"semver": "^5.3.0"
}
},
"dependencies": {}
}
12 changes: 4 additions & 8 deletions packages/react-forms-dom/src/components/submit.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import {
import { HTMLElementProps } from "../contracts/field";

export interface SubmitProps extends BaseFormButtonProps, HTMLElementProps<HTMLButtonElement> {
fieldIds?: string[];

ref?: React.Ref<Submit>;
}

Expand All @@ -23,11 +21,9 @@ export class Submit extends BaseFormButton<SubmitProps, BaseFormButtonStateRecor
disableOnError: true
};

protected OnButtonClick: React.MouseEventHandler<HTMLButtonElement> = event => {
// If Button is outside of Form context, initiate form submit.
if (this.props.formId !== null) {
this.FormStore.InitiateFormSubmit();
}
protected OnClick: React.MouseEventHandler<HTMLButtonElement> = event => {
event.preventDefault();
this.FormStore.InitiateFormSubmit();

if (this.props.onClick != null) {
event.persist();
Expand All @@ -41,7 +37,7 @@ export class Submit extends BaseFormButton<SubmitProps, BaseFormButtonStateRecor
className={this.ClassName}
style={this.InlineStyles}
disabled={this.Disabled}
onClick={this.OnButtonClick}
onClick={this.OnClick}
{...this.GetHTMLProps(this.props) }
>
{this.props.children}
Expand Down
276 changes: 0 additions & 276 deletions tools/rush-tools-new.ts

This file was deleted.

Loading