(js) Optimize display of event editor
This commit is contained in:
parent
6d2094bf83
commit
01bda0783c
|
@ -208,12 +208,12 @@
|
||||||
</md-button>
|
</md-button>
|
||||||
</div>
|
</div>
|
||||||
<div flex-offset="5"
|
<div flex-offset="5"
|
||||||
ng-show="editor.showRecurrenceEditor">
|
ng-if="editor.showRecurrenceEditor">
|
||||||
<var:component className="UIxRecurrenceEditor" />
|
<var:component className="UIxRecurrenceEditor" />
|
||||||
</div>
|
</div>
|
||||||
<!-- end repeat -->
|
<!-- end repeat -->
|
||||||
<div layout="row"
|
<div layout="row"
|
||||||
ng-show="editor.component.repeat.frequency != 'never'">
|
ng-if="editor.component.repeat.frequency != 'never'">
|
||||||
<md-input-container class="md-block" flex="50" flex-xs="100">
|
<md-input-container class="md-block" flex="50" flex-xs="100">
|
||||||
<label><var:string label:value="End Repeat"/></label>
|
<label><var:string label:value="End Repeat"/></label>
|
||||||
<md-select ng-model="editor.component.repeat.end"
|
<md-select ng-model="editor.component.repeat.end"
|
||||||
|
@ -299,7 +299,7 @@
|
||||||
<var:string label:value="Reminder"/>
|
<var:string label:value="Reminder"/>
|
||||||
</md-checkbox>
|
</md-checkbox>
|
||||||
<div flex-offset="5"
|
<div flex-offset="5"
|
||||||
ng-show="editor.component.$hasAlarm">
|
ng-if="editor.component.$hasAlarm">
|
||||||
<var:component className="UIxReminderEditor" />
|
<var:component className="UIxReminderEditor" />
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -388,6 +388,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
this.changeAlarmRelation = function (form) {
|
this.changeAlarmRelation = function (form) {
|
||||||
|
if (form.alarmRelation) {
|
||||||
if (this.component.type == 'task' && this.component.$hasAlarm &&
|
if (this.component.type == 'task' && this.component.$hasAlarm &&
|
||||||
(this.component.start || this.component.due) &&
|
(this.component.start || this.component.due) &&
|
||||||
((!this.component.start && this.component.alarm.relation == 'START') ||
|
((!this.component.start && this.component.alarm.relation == 'START') ||
|
||||||
|
@ -397,6 +398,7 @@
|
||||||
else {
|
else {
|
||||||
form.alarmRelation.$setValidity('alarm', true);
|
form.alarmRelation.$setValidity('alarm', true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
this.onAlarmChange = function (form) {
|
this.onAlarmChange = function (form) {
|
||||||
|
|
Loading…
Reference in a new issue