parent
d8ebd0bccf
commit
8cf8ce86d7
3
NEWS
3
NEWS
|
@ -15,10 +15,11 @@ Enhancements
|
||||||
- [web] we now "cc" delegates during invitation updates (#3195)
|
- [web] we now "cc" delegates during invitation updates (#3195)
|
||||||
- [web] new SOGoHelpURL preference to set a custom URL for SOGo help (#2768)
|
- [web] new SOGoHelpURL preference to set a custom URL for SOGo help (#2768)
|
||||||
- [web] now able to copy/move events and also duplicate them (#3196)
|
- [web] now able to copy/move events and also duplicate them (#3196)
|
||||||
- [web] improve preferences validation and check for unsaved changes
|
- [web] improved preferences validation and now check for unsaved changes
|
||||||
- [web] display events and tasks priorities in list and day/week views (#3162)
|
- [web] display events and tasks priorities in list and day/week views (#3162)
|
||||||
- [web] style events depending on the user participation state
|
- [web] style events depending on the user participation state
|
||||||
- [web] style transparent events (show time as free) (#3192)
|
- [web] style transparent events (show time as free) (#3192)
|
||||||
|
- [web] improved input parsing of time picker (#3659)
|
||||||
|
|
||||||
Bug fixes
|
Bug fixes
|
||||||
- [core] properly escape wide characters (#3616)
|
- [core] properly escape wide characters (#3616)
|
||||||
|
|
|
@ -374,8 +374,7 @@
|
||||||
' <md-icon class="sg-timepicker-icon">access_time</md-icon>',
|
' <md-icon class="sg-timepicker-icon">access_time</md-icon>',
|
||||||
'</md-button>',
|
'</md-button>',
|
||||||
'<div class="md-default-theme sg-timepicker-input-container" ',
|
'<div class="md-default-theme sg-timepicker-input-container" ',
|
||||||
' ng-class="{\'sg-timepicker-focused\': ctrl.isFocused,',
|
' ng-class="{\'sg-timepicker-focused\': ctrl.isFocused}">',
|
||||||
' \'md-bdr\': ctrl.isFocused}">',
|
|
||||||
' <input class="sg-timepicker-input" aria-haspopup="true" ',
|
' <input class="sg-timepicker-input" aria-haspopup="true" ',
|
||||||
' ng-focus="ctrl.setFocused(true)" ng-blur="ctrl.setFocused(false)">',
|
' ng-focus="ctrl.setFocused(true)" ng-blur="ctrl.setFocused(false)">',
|
||||||
' <md-button type="button" md-no-ink ',
|
' <md-button type="button" md-no-ink ',
|
||||||
|
@ -720,6 +719,12 @@
|
||||||
this.inputContainer.classList.remove(INVALID_CLASS);
|
this.inputContainer.classList.remove(INVALID_CLASS);
|
||||||
}
|
}
|
||||||
else if (arr.length < 2) {
|
else if (arr.length < 2) {
|
||||||
|
arr = /(\d{1,2})(\d{2})/i.exec(inputString);
|
||||||
|
if (arr)
|
||||||
|
arr.splice(0, 1); // only keep text captured by parenthesis
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!arr || arr.length < 2) {
|
||||||
this.inputContainer.classList.toggle(INVALID_CLASS, inputString);
|
this.inputContainer.classList.toggle(INVALID_CLASS, inputString);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
@ -731,6 +736,7 @@
|
||||||
newVal.setMinutes(m);
|
newVal.setMinutes(m);
|
||||||
this.ngModelCtrl.$setViewValue(newVal);
|
this.ngModelCtrl.$setViewValue(newVal);
|
||||||
this.time = newVal;
|
this.time = newVal;
|
||||||
|
this.inputElement.value = this.dateLocale.formatTime(newVal);
|
||||||
this.inputContainer.classList.remove(INVALID_CLASS);
|
this.inputContainer.classList.remove(INVALID_CLASS);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
|
|
|
@ -115,13 +115,17 @@ sg-timepicker {
|
||||||
.sg-timepicker-input-container {
|
.sg-timepicker-input-container {
|
||||||
@extend .md-datepicker-input-container;
|
@extend .md-datepicker-input-container;
|
||||||
|
|
||||||
|
// From datePicker-theme.scss
|
||||||
|
border-bottom-color: $colorGrey300; // {{background-300}}
|
||||||
|
|
||||||
&.sg-timepicker-focused {
|
&.sg-timepicker-focused {
|
||||||
|
border-bottom-color: sg-color($sogoBlue, 500); // {{primary-500}}
|
||||||
border-bottom-width: 2px;
|
border-bottom-width: 2px;
|
||||||
}
|
}
|
||||||
|
|
||||||
// From datePicker-theme.scss
|
&.sg-timepicker-invalid {
|
||||||
// TODO: should use background-300
|
border-bottom-color: $colorRedA700; // {{warn-A700}}
|
||||||
border-bottom-color: rgb(224,224,224);
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue