Skip to content

Commit 31b7fb5

Browse files
author
edencoder
committed
amend date issues
1 parent 3046778 commit 31b7fb5

File tree

4 files changed

+77
-7
lines changed

4 files changed

+77
-7
lines changed

bundles/form/views/field/checkbox/input.riot

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,6 @@
4343
4444
// set initial value
4545
this.value = this.props.value || [];
46-
47-
console.log(this.value);
4846
}
4947
5048
/**
@@ -68,8 +66,6 @@
6866
// set value
6967
this.value = this.val();
7068
71-
console.log(this.value);
72-
7369
// check form
7470
if (this.props.form) {
7571
// update

bundles/form/views/field/date/input.riot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
const check = new Date(this.props.value || {});
8989
9090
// set initial value
91-
this.value = isNaN(check.getTime()) ? (this.props.value || {}) : {
91+
this.value = isNaN(check.getTime()) || check.getTime() === 0 ? (this.props.value || {}) : {
9292
start,
9393
};
9494
Lines changed: 72 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,74 @@
11
<field-wysiwyg-display>
2-
<field-display { ...props } />
2+
<div>
3+
<div class="mb-3">
4+
<label class="form-label">
5+
WYSIWYG Display
6+
</label>
7+
<eden-select class="ml-2 flex-1" on-change={ (e, r) => onInput(r) } placeholder="WYSIWYG Display" data={ getInput() } />
8+
</div>
9+
<div if={ props.field.input === 'display' }>
10+
<label class="form-label">
11+
Field Display
12+
</label>
13+
<editor ref={ ref('wysiwyg') } show-toolbar={ true } name="display" placeholder="Field Display" content={ props.field.display } on-change={ (e) => onChange(e) } />
14+
</div>
15+
16+
<field-display { ...props } />
17+
</div>
18+
19+
<script>
20+
// import base
21+
import Base from '../../js/base';
22+
23+
// field wysiwyg
24+
export default class FieldWysiwygDisplay extends Base {
25+
26+
/**
27+
* return value
28+
*
29+
* @return {*}
30+
*/
31+
val() {
32+
// return non accumulated value
33+
return this.refs.wysiwyg ? this.refs.wysiwyg.val() : $('textarea', this.root).val();
34+
}
35+
36+
/**
37+
* on amount
38+
*/
39+
onInput(v) {
40+
// set duration
41+
this.props.set('input', v);
42+
}
43+
44+
/**
45+
* get value
46+
*/
47+
getInput() {
48+
// return triggers
49+
return ['Display', 'Input'].map((display) => {
50+
console.log(this.props.field.input);
51+
// return object
52+
return {
53+
name : `WYSIWYG ${display}`,
54+
value : display.toLowerCase(),
55+
selected : (this.props.field.input || 'input') === display.toLowerCase(),
56+
};
57+
});
58+
}
59+
60+
/**
61+
* on change
62+
*
63+
* @param {Event} e
64+
*/
65+
onChange(e) {
66+
// set value
67+
const val = (this.val() || '').replace('<p><br></p>', '').trim();
68+
69+
// check form
70+
this.props.set('display', val);
71+
}
72+
}
73+
</script>
374
</field-wysiwyg-display>

bundles/form/views/field/wysiwyg/input.riot

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
<field-wysiwyg-input>
2-
<div>
2+
<div if={ props.field.input !== 'display' }>
33
<label class="form-label" if={ !props.field.label } for={ props.getId(props.field.uuid) }>
44
<a href="#!" onclick={ (e) => props.updateAction(e, props.field) }>
55
<i>Set Label</i>
66
</a>
77
</label>
88
<editor ref={ ref('wysiwyg') } show-toolbar={ true } name={ props.getName(props.field.uuid) } label={ props.field.label } placeholder={ props.field.placeholder } content={ get(`value.${eden.get('i18n.lng')}`, get('value', '')) } required={ props.field.required } on-change={ onChange } />
99
</div>
10+
<div if={ props.field.input === 'display' } class={ !props.field.display || !props.field.display.length ? 'pb-4' : 'mb-3' }>
11+
<editor-render content={ props.field.display } />
12+
</div>
1013

1114
<script>
1215
// import base

0 commit comments

Comments
 (0)