Skip to content

Commit fb3d834

Browse files
committed
Merge branch 'hotfix/1.4.1'
2 parents 3bfb832 + dd69b68 commit fb3d834

5 files changed

Lines changed: 17 additions & 10 deletions

File tree

client/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "simple-task-manager",
3-
"version": "1.4.0",
3+
"version": "1.4.1",
44
"scripts": {
55
"ng": "ng",
66
"dev": "ng serve --watch",

client/src/app/auth/login/login.component.html

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
<app-notification></app-notification>
2-
<div class="language-selection">
3-
<span class="language-selection-label" i18n>Language selection:</span>
4-
<app-language-selection></app-language-selection>
1+
<div>
2+
<app-notification></app-notification>
3+
<div class="language-selection">
4+
<span class="language-selection-label" i18n>Language selection:</span>
5+
<app-language-selection></app-language-selection>
6+
</div>
57
</div>
68
<div>
79
<div>

client/src/app/common/shortcut.service.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,21 @@ export class ShortcutService {
1212
@Inject(DOCUMENT) document: Document) {
1313
}
1414

15+
// Ignore shortcuts on these node types
16+
private ignoredNodeNames = ['input', 'textarea', 'select', 'option'];
17+
1518
/**
1619
* @param shortcutString A string defining the shortcut. E.g. "shift.d" should say that the "shift" and "d" key must be pressed.
1720
*/
1821
add(shortcutString: string): Observable<void> {
1922
const eventString = `keydown.${shortcutString}`;
2023

2124
return new Observable(observer => {
22-
const handler = (e: Event) => {
23-
e.preventDefault();
24-
observer.next();
25+
const handler = (e: KeyboardEvent) => {
26+
if (e.target instanceof HTMLElement && !this.ignoredNodeNames.includes(e.target.nodeName.toLowerCase())) {
27+
e.preventDefault();
28+
observer.next();
29+
}
2530
};
2631

2732
const removeHandlerCallback = this.eventManager.addEventListener(

server/util/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
)
1010

1111
const (
12-
VERSION = "1.4.0"
12+
VERSION = "1.4.1"
1313
)
1414

1515
func GetParam(param string, r *http.Request) (string, error) {

0 commit comments

Comments
 (0)