ylqjgm
/
canvas-lms
mirror of https://github.com/instructure/canvas-lms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Upgrade GraderCountNumberInput to instUI5 

Change-Id: Ibfadc87a8433cea79579c6749978f29b19cdff9f
Reviewed-on: https://gerrit.instructure.com/151103
Tested-by: Jenkins
Reviewed-by: Clay Diffrient <cdiffrient@instructure.com>
Product-Review: Ryan Shaw <ryan@instructure.com>
QA-Review: Ryan Shaw <ryan@instructure.com>
This commit is contained in:
Ryan Shaw 2018-05-21 14:50:54 -06:00
parent 4909a62927
commit 33fbb404e3
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/jsx/assignments/GraderCountNumberInput.js
View File

@ -34,15 +34,9 @@ export default class GraderCountNumberInput extends React.Component {
currentGraderCount: null
}
constructor(props) {
super(props)
this.generateMessages = this.generateMessages.bind(this)
this.handleNumberInputBlur = this.handleNumberInputBlur.bind(this)
this.handleNumberInputChange = this.handleNumberInputChange.bind(this)
this.state = {
graderCount: props.currentGraderCount || Math.min(props.maxGraderCount, DEFAULT_GRADER_COUNT),
messages: []
}
state = {
graderCount: this.props.currentGraderCount || Math.min(this.props.maxGraderCount, DEFAULT_GRADER_COUNT),
messages: []
}
generateMessages(newValue, eventType) {
@ -67,13 +61,13 @@ export default class GraderCountNumberInput extends React.Component {
return []
}
handleNumberInputBlur({target: {value}}) {
handleNumberInputBlur(value) {
if (value === '') {
this.setState({messages: this.generateMessages(value, 'blur')})
}
}
handleNumberInputChange({target: {value}}) {
handleNumberInputChange(value) {
if (value === '') {
this.setState({graderCount: '', messages: this.generateMessages(value, 'change')})
} else {
@ -100,8 +94,8 @@ export default class GraderCountNumberInput extends React.Component {
messages={this.state.messages}
min="1"
name="grader_count"
onChange={this.handleNumberInputChange}
onBlur={this.handleNumberInputBlur}
onChange={e => { if (e.type !== 'blur') this.handleNumberInputChange(e.target.value)}}
onBlur={e => this.handleNumberInputBlur(e.target.value)}
showArrows={false}
width="5rem"
/>

4
spec/javascripts/jsx/assignments/GraderCountNumberInputSpec.js
View File

@ -110,8 +110,8 @@ QUnit.module('GraderCountNumberInput', hooks => {
test('shows an error message on blur if the grader count is the empty string', () => {
mountComponent()
numberInput().simulate('change', { target: { value: '' } })
numberInput().simulate('blur')
numberInput().simulate('change', {target: {value: '' }})
numberInput().simulate('blur', {type: 'blur', target: {value: ''}})
ok(numberInputContainer().text().includes('Must have at least 1 grader'))
})