Revert "Merge pull request #867 from matrix-org/t3chguy/BaseDialog-patch1"
This reverts commitpull/21833/head3549ff2543, reversing changes made to1db677141e.
							parent
							
								
									c15a67a8d8
								
							
						
					
					
						commit
						6bd7af2917
					
				|  | @ -57,25 +57,20 @@ export default React.createClass({ | |||
|         } | ||||
|     }, | ||||
| 
 | ||||
|     // Don't let key{down,press} events escape the modal. Consume them all.
 | ||||
|     _eatKeyEvent: function(e) { | ||||
|         e.stopPropagation(); | ||||
|     }, | ||||
|      | ||||
|     // Must be when the key is released (and not pressed) otherwise componentWillUnmount
 | ||||
|     // will focus another element which will receive future key events
 | ||||
|     _onKeyUp: function(e) { | ||||
|         if (e.keyCode === KeyCode.ESCAPE) { | ||||
|             e.stopPropagation(); | ||||
|             e.preventDefault(); | ||||
|             this.props.onFinished(); | ||||
|         } else if (e.keyCode === KeyCode.ENTER) { | ||||
|             if (this.props.onEnterPressed) { | ||||
|                 e.stopPropagation(); | ||||
|                 e.preventDefault(); | ||||
|                 this.props.onEnterPressed(e); | ||||
|             } | ||||
|         } | ||||
|         // Consume all keyup events while Modal is open
 | ||||
|         e.stopPropagation(); | ||||
|     }, | ||||
| 
 | ||||
|     _onCancelClick: function(e) { | ||||
|  | @ -86,11 +81,7 @@ export default React.createClass({ | |||
|         const TintableSvg = sdk.getComponent("elements.TintableSvg"); | ||||
| 
 | ||||
|         return ( | ||||
|             <div onKeyUp={this._onKeyUp} | ||||
|                  onKeyDown={this._eatKeyEvent} | ||||
|                  onKeyPress={this._eatKeyEvent} | ||||
|                  className={this.props.className} | ||||
|             > | ||||
|             <div onKeyUp={this._onKeyUp} className={this.props.className}> | ||||
|                 <AccessibleButton onClick={this._onCancelClick} | ||||
|                     className="mx_Dialog_cancelButton" | ||||
|                 > | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 David Baker
						David Baker