Commit 90ee028

committed

Merge pull request #36 from merk/patch-1

Handle disabled components

2 parents 093506b + cce3f67 commit 90ee028Copy full SHA for 90ee028

File tree

+31

-0

lines changed

+31

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@ function isModifiedEvent(event) {`
`12`	`12`	`module.exports = {`
`13`	`13`	`propTypes: {`
`14`	`14`	`activeClassName: React.PropTypes.string.isRequired,`
	`15`	`+ disabled: React.PropTypes.bool,`
`15`	`16`	`to: React.PropTypes.string.isRequired,`
`16`	`17`	`params: React.PropTypes.object,`
`17`	`18`	`query: React.PropTypes.object,`
`@@ -56,6 +57,10 @@ module.exports = {`
`56`	`57`	`handleRouteTo: function (event) {`
`57`	`58`	`var allowTransition = true;`
`58`	`59`	`var clickResult;`
	`60`	`+`
	`61`	`+ if (this.props.disabled) {`
	`62`	`+ return;`
	`63`	`+ }`
`59`	`64`
`60`	`65`	`if (this.props.onClick) {`
`61`	`66`	`clickResult = this.props.onClick(event);`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -124,6 +124,32 @@ describe('A NavItemLink', function () {`
`124`	`124`	`});`
`125`	`125`	`});`
`126`	`126`
	`127`	`+ it('when disabled does not proceed', function () {`
	`128`	`+ var NavItemLinkHandler = React.createClass({`
	`129`	`+ handleClick: function (event) {`
	`130`	`+ throw new Error('click should not be called');`
	`131`	`+ },`
	`132`	`+`
	`133`	`+ render: function () {`
	`134`	`+ return <NavItemLink to="foo" disabled onClick={this.handleClick}>NavItemLink</NavItemLink>;`
	`135`	`+ }`
	`136`	`+ });`
	`137`	`+`
	`138`	`+ var routes = [`
	`139`	`+ <Route name="foo" handler={Foo} />,`
	`140`	`+ <Route name="link" handler={NavItemLinkHandler} />`
	`141`	`+ ];`
	`142`	`+ var div = document.createElement('div');`
	`143`	`+ var testLocation = new TestLocation();`
	`144`	`+ testLocation.history = ['/link'];`
	`145`	`+`
	`146`	`+ Router.run(routes, testLocation, function (Handler) {`
	`147`	`+ React.render(<Handler/>, div, function () {`
	`148`	`+ click(div.querySelector('a'));`
	`149`	`+ });`
	`150`	`+ });`
	`151`	`+ });`
	`152`	`+`
`127`	`153`	`it('transitions to the correct route', function (done) {`
`128`	`154`	`var div = document.createElement('div');`
`129`	`155`	`var testLocation = new TestLocation();`

Comments

(0)