Skip to content

Commit fcd33e7

Browse files
committed
moved errorDisplay to render function
1 parent 150421e commit fcd33e7

File tree

4 files changed

+24
-25
lines changed

4 files changed

+24
-25
lines changed

src/components/errorDisplay.js

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
export default {
2+
render(h){
3+
if ( this.message ) return h('span', {
4+
'class': 'help-block form-text text-danger'
5+
}, this.message);
6+
},
7+
props: ['field', 'form'],
8+
computed: {
9+
message(){
10+
let message = false;
11+
if ( !( this.field in this.form.$errors ) || !( this.field in this.form ) || this.form[ this.field ].$active || !this.form[this.field].$dirty ) return message;
12+
let errors = this.form.$errors[ this.field ];
13+
Object.keys( errors ).some( errorKey => {
14+
if ( typeof errors[ errorKey ] != 'boolean' ){
15+
message = errors[ errorKey ];
16+
return true;
17+
}
18+
});
19+
return message;
20+
}
21+
}
22+
}

src/components/errorDisplay.vue

Lines changed: 0 additions & 23 deletions
This file was deleted.

src/fields/baseField.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import errorDisplay from '../components/errorDisplay.vue';
1+
import errorDisplay from '../components/errorDisplay';
22
export default
33
{
44
props: [

test/unit/specs/ErrorDisplay.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {expect} from 'chai';
33
import sinonChai from 'sinon-chai';
44
import sinon from 'sinon';
55
import Vue from 'vue';
6-
import errorDisplay from 'src/components/errorDisplay.vue';
6+
import errorDisplay from 'src/components/errorDisplay';
77

88
let el, vm, data;
99

0 commit comments

Comments
 (0)