amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-19 03:49:28 +00:00
Code Issues Projects Releases Wiki Activity

(js) Improved input parsing of time picker

Browse Source 
Fixes #3659
This commit is contained in:
Francis Lachapelle
2016-05-09 14:48:22 -04:00
parent d8ebd0bccf
commit 8cf8ce86d7
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
UI/WebServerResources/js/Common/sgTimepicker.directive.js
View File

@@ -374,8 +374,7 @@
' <md-icon class="sg-timepicker-icon">access_time</md-icon>',
'</md-button>',
'<div class="md-default-theme sg-timepicker-input-container" ',
' ng-class="{\'sg-timepicker-focused\': ctrl.isFocused,',
' \'md-bdr\': ctrl.isFocused}">',
' ng-class="{\'sg-timepicker-focused\': ctrl.isFocused}">',
' <input class="sg-timepicker-input" aria-haspopup="true" ',
' ng-focus="ctrl.setFocused(true)" ng-blur="ctrl.setFocused(false)">',
' <md-button type="button" md-no-ink ',
@@ -720,6 +719,12 @@
this.inputContainer.classList.remove(INVALID_CLASS);
}
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);
}
else {
@@ -731,6 +736,7 @@
newVal.setMinutes(m);
this.ngModelCtrl.$setViewValue(newVal);
this.time = newVal;
this.inputElement.value = this.dateLocale.formatTime(newVal);
this.inputContainer.classList.remove(INVALID_CLASS);
}
else {