Skip to content

Unscaped html for error msg #370

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Jan 9, 2018
Merged

Unscaped html for error msg #370

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
20b8d9d
add unscape html for error message.
gezichenshan Jan 5, 2018
3208446
Update formGenerator.vue
gezichenshan Jan 5, 2018
d4bc27a
change the judgement
Jan 5, 2018
45e1436
commit the built bundle
Jan 5, 2018
12b3cf7
commit the built dist
Jan 5, 2018
d05818e
add console.log to debug
Jan 7, 2018
fa779bd
add console.log
Jan 7, 2018
ed853a2
delete console.log
Jan 7, 2018
79a77bd
commit without console.log
Jan 7, 2018
ecd2ca5
remove the errorUnescaped property, add v-html on the error part
Jan 9, 2018
026439a
add indent
Jan 9, 2018
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
6 changes: 3 additions & 3 deletions dist/vfg-core.js
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions dist/vfg.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/fields/core/fieldInput.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ export default {
onInput($event) {
let value = $event.target.value;
switch(this.schema.inputType.toLowerCase()) {
case "number":
case "number":
case "range":
if($event.target.valueAsNumber) {
value = $event.target.valueAsNumber;
Expand Down Expand Up @@ -138,7 +138,7 @@ export default {

created () {
if(this.schema.inputType.toLowerCase() == "file") {
console.warn("The 'file' type in input field is deprecated. Use 'file' field instead.");
console.warn("The 'file' type in input field is deprecated. Use 'file' field instead.");
}
}
};
Expand Down
8 changes: 4 additions & 4 deletions src/formGenerator.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ div.vue-form-generator(v-if='schema != null')
button(v-for='btn in field.buttons', @click='buttonClickHandler(btn, field, $event)', :class='btn.classes') {{ btn.label }}
.hint(v-if='field.hint') {{ fieldHint(field) }}
.errors.help-block(v-if='fieldErrors(field).length > 0')
span(v-for='(error, index) in fieldErrors(field)', track-by='index') {{ error }}
span(v-for='(error, index) in fieldErrors(field)', v-html="error", track-by='index')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add indent


template(v-for='group in groups')
fieldset(:is='tag', :class='getFieldRowClasses(group)')
Expand All @@ -32,7 +32,7 @@ div.vue-form-generator(v-if='schema != null')
button(v-for='btn in field.buttons', @click='buttonClickHandler(btn, field, $event)', :class='btn.classes') {{ btn.label }}
.hint(v-if='field.hint') {{ field.hint }}
.errors.help-block(v-if='fieldErrors(field).length > 0')
span(v-for='(error, index) in fieldErrors(field)', track-by='index') {{ error }}
span(v-for='(error, index) in fieldErrors(field)', v-html="error", track-by='index')
</template>

<script>
Expand Down Expand Up @@ -280,7 +280,7 @@ div.vue-form-generator(v-if='schema != null')

return field.featured;
},

// Get current hint.
fieldHint(field){
if (isFunction(field.hint))
Expand Down Expand Up @@ -379,7 +379,7 @@ div.vue-form-generator(v-if='schema != null')
getFieldID(schema) {
const idPrefix = this.options && this.options.fieldIdPrefix ? this.options.fieldIdPrefix : "";
return slugifyFormID(schema, idPrefix);
}
}
}
};

Expand Down