Skip to content

Commit

Permalink
Merge branch 'hotfix/1.4.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
hauke96 committed Jul 3, 2021
2 parents 3bfb832 + dd69b68 commit fb3d834
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 10 deletions.
2 changes: 1 addition & 1 deletion client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "simple-task-manager",
"version": "1.4.0",
"version": "1.4.1",
"scripts": {
"ng": "ng",
"dev": "ng serve --watch",
Expand Down
10 changes: 6 additions & 4 deletions client/src/app/auth/login/login.component.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<app-notification></app-notification>
<div class="language-selection">
<span class="language-selection-label" i18n>Language selection:</span>
<app-language-selection></app-language-selection>
<div>
<app-notification></app-notification>
<div class="language-selection">
<span class="language-selection-label" i18n>Language selection:</span>
<app-language-selection></app-language-selection>
</div>
</div>
<div>
<div>
Expand Down
11 changes: 8 additions & 3 deletions client/src/app/common/shortcut.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,21 @@ export class ShortcutService {
@Inject(DOCUMENT) document: Document) {
}

// Ignore shortcuts on these node types
private ignoredNodeNames = ['input', 'textarea', 'select', 'option'];

/**
* @param shortcutString A string defining the shortcut. E.g. "shift.d" should say that the "shift" and "d" key must be pressed.
*/
add(shortcutString: string): Observable<void> {
const eventString = `keydown.${shortcutString}`;

return new Observable(observer => {
const handler = (e: Event) => {
e.preventDefault();
observer.next();
const handler = (e: KeyboardEvent) => {
if (e.target instanceof HTMLElement && !this.ignoredNodeNames.includes(e.target.nodeName.toLowerCase())) {
e.preventDefault();
observer.next();
}
};

const removeHandlerCallback = this.eventManager.addEventListener(
Expand Down
2 changes: 1 addition & 1 deletion server/util/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
)

const (
VERSION = "1.4.0"
VERSION = "1.4.1"
)

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

0 comments on commit fb3d834

Please sign in to comment.