Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'develop' of git.znuny.com:zammad/zammad into develop

Browse source
This commit is contained in:
Martin Edenhofer 2018-04-12 13:23:56 +02:00
commit 1247425310
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/assets/javascripts/app/lib/bootstrap/bootstrap-timepicker.js vendored
View file

@ -238,16 +238,29 @@
this.update(); this.update();
break; break;
case 8: // backspace - ignore case 8: // backspace - ignore
this.highlightedUnit = null;
break;
case 186: // colon
// value is "5" or "10" and a ":" was typed -> turn into 05:00 or 10:00 with 00 selected
if(this.$element.val().length <= 2){
this.setTime(this.$element.val(), undefined, true);
this.$element.val(this.getTime());
this.highlightMinute();
e.preventDefault();
}
if(this.highlightedUnit == 'hour'){
setTimeout($.proxy(this.highlightNextUnit, this), 0);
e.preventDefault();
}
break; break;
default: default:
// all other keys // all other keys
// if cursor position is at the end of hour, jump to minute // if cursor position is at the end of hour, jump to minute
switch (this.getCursorPosition()) { switch (this.getCursorPosition()) {
case 1: case 1:
this.highlightMinute(); // highlight minutes but async because the newly typed character is not yet stored in the value (happens after this event)
setTimeout($.proxy(this.highlightMinute, this), 0);
break; break;
case 3:
} }
} }
}, },