tykayn/funky-framadate-front
1
1
Fork 1
mirror of https://framagit.org/framasoft/framadate/funky-framadate-front.git synced 2023-08-25 13:53:14 +02:00
Code Issues Projects Releases Wiki Activity

fix focus modal lang

Browse Source
This commit is contained in:
Tykayn 2022-02-16 11:57:08 +01:00 committed by tykayn
parent 80736d111f
commit cf93f5637c
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/components/selectors/language-selector/language-selector.component.html
View File

@ -36,7 +36,7 @@
id="close_dialog{{ idSuffix }}" id="close_dialog{{ idSuffix }}"
class="button cancel-button-reject pull-right img-marged-left has-no-border" class="button cancel-button-reject pull-right img-marged-left has-no-border"
lang="{{ currentLang }}" lang="{{ currentLang }}"
(click)="focusOnCancelButton()" (click)="closeModalAndFocusOnButtonToOpen()"
> >
{{ 'SENTENCES.Close' | translate }} {{ 'SENTENCES.Close' | translate }}
<img class="icon" src="assets/icons/x_blue.svg" /> <img class="icon" src="assets/icons/x_blue.svg" />

9
src/app/shared/components/selectors/language-selector/language-selector.component.ts
View File

@ -5,6 +5,7 @@ import { LanguageService } from '../../../../core/services/language.service';
import { StorageService } from '../../../../core/services/storage.service'; import { StorageService } from '../../../../core/services/storage.service';
import { DOCUMENT } from '@angular/common'; import { DOCUMENT } from '@angular/common';
import { PollService } from '../../../../core/services/poll.service'; import { PollService } from '../../../../core/services/poll.service';
import { environment } from '../../../../../environments/environment';
@Component({ @Component({
selector: 'app-language-selector', selector: 'app-language-selector',
@ -38,16 +39,17 @@ export class LanguageSelectorComponent implements OnInit {
this.language_to_apply = '' + this.currentLang; this.language_to_apply = '' + this.currentLang;
} }
setLang(newlang: string = 'fr'): void { setLang(newlang: string = environment.defaultLanguage): void {
this.currentLang = newlang; this.currentLang = newlang;
this.languageService.setLanguage(newlang); this.languageService.setLanguage(newlang);
this.storageService.language = this.currentLang; this.storageService.language = this.currentLang;
this.pollService.updateTitle(); this.pollService.updateTitle();
} }
focusOnCancelButton() { closeModalAndFocusOnButtonToOpen() {
this.display_lang_dialog = false; this.display_lang_dialog = false;
let buttonClose = this.document.querySelector('#display_cancel_popup_button'); this.cd.detectChanges();
let buttonClose = this.document.querySelector('#lang_button_popup');
if (buttonClose) { if (buttonClose) {
buttonClose.focus(); buttonClose.focus();
} }
@ -71,6 +73,7 @@ export class LanguageSelectorComponent implements OnInit {
applyLangAndClosePopup() { applyLangAndClosePopup() {
this.setLang(this.language_to_apply); this.setLang(this.language_to_apply);
this.display_lang_dialog = false; this.display_lang_dialog = false;
this.cd.detectChanges();
let elem = this.document.querySelector('#lang_button_popup'); let elem = this.document.querySelector('#lang_button_popup');
if (elem) { if (elem) {
elem.focus(); elem.focus();