From 60d325047d39d095cd4542b23075742d332ffc6a Mon Sep 17 00:00:00 2001
From: Sandro Lutz <code@temparus.ch>
Date: Sun, 4 Mar 2018 12:30:09 +0100
Subject: [PATCH] Minor changes according to discussion in !30
---
src/views/form/inputGroup.js | 14 ++++++--------
src/views/form/jsonSchemaForm.js | 3 +--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/views/form/inputGroup.js b/src/views/form/inputGroup.js
index 1890b2b2..488de7c5 100644
--- a/src/views/form/inputGroup.js
+++ b/src/views/form/inputGroup.js
@@ -13,7 +13,7 @@ export default class InputGroup {
view(vnode) {
// set display-settings accoridng to error-state
let errorField = null;
- let groupClasses = vnode.attrs.classes ? vnode.attrs.classes : '';
+ let groupClasses = vnode.attrs.classes || '';
const errors = this.getErrors();
if (errors.length > 0) {
errorField = m('span', `Error: ${errors.join(', ')}`);
@@ -37,15 +37,13 @@ export default class InputGroup {
]);
}
args.list = `${vnode.attrs.name}-datalist`;
- if (typeof args.getSuggestions === 'function') {
+ if (args.getSuggestions) {
args.oninput_original = args.oninput;
args.oninput = (e) => {
- if (typeof args.getSuggestions === 'function') {
- args.getSuggestions(e.target.value, (result) => {
- this.suggestions = result;
- });
- }
- if (typeof args.oninput_original === 'function') {
+ args.getSuggestions(e.target.value, (result) => {
+ this.suggestions = result;
+ });
+ if (args.oninput_original) {
args.oninput_original(e);
}
};
diff --git a/src/views/form/jsonSchemaForm.js b/src/views/form/jsonSchemaForm.js
index a83c8900..f7d34a15 100644
--- a/src/views/form/jsonSchemaForm.js
+++ b/src/views/form/jsonSchemaForm.js
@@ -1,7 +1,6 @@
import m from 'mithril';
import Ajv from 'ajv';
import jsonSchemaDraft04 from 'ajv/lib/refs/json-schema-draft-04.json';
-import { isNullOrUndefined } from 'util';
import { log } from '../../models/log';
import inputGroup from './inputGroup';
import selectGroup from './selectGroup';
@@ -27,7 +26,7 @@ export default class JSONSchemaForm {
} else {
this.ajv.addSchema(this.schema, 'schema');
}
- if (isNullOrUndefined(this.fieldOrder)) {
+ if (!this.fieldOrder) {
this.fieldOrder = [];
}
}
--
GitLab