EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1574 from dpalou/MOBILE-2694 

MOBILE-2694 core: Reopen keyboard in Android when show password
main
Juan Leyva 2018-10-22 16:00:03 +02:00 committed by GitHub
parent 17f707ed86 e7b273bb19
commit bfe0bd45e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/components/show-password/show-password.ts
View File

@ -13,7 +13,9 @@
// limitations under the License. // limitations under the License.
import { Component, OnInit, AfterViewInit, Input, ElementRef } from '@angular/core'; import { Component, OnInit, AfterViewInit, Input, ElementRef } from '@angular/core';
import { CoreDomUtilsProvider } from '@providers/utils/dom';
import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreUtilsProvider } from '@providers/utils/utils';
import { Platform } from 'ionic-angular';
/** /**
* Component to allow showing and hiding a password. The affected input MUST have a name to identify it. * Component to allow showing and hiding a password. The affected input MUST have a name to identify it.
@ -45,7 +47,8 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
protected input: HTMLInputElement; // Input affected. protected input: HTMLInputElement; // Input affected.
protected element: HTMLElement; // Current element. protected element: HTMLElement; // Current element.
constructor(element: ElementRef, private utils: CoreUtilsProvider) { constructor(element: ElementRef, private utils: CoreUtilsProvider, private domUtils: CoreDomUtilsProvider,
private platform: Platform) {
this.element = element.nativeElement; this.element = element.nativeElement;
} }
@ -106,7 +109,16 @@ export class CoreShowPasswordComponent implements OnInit, AfterViewInit {
event.preventDefault(); event.preventDefault();
event.stopPropagation(); event.stopPropagation();
const isFocused = document.activeElement === this.input;
this.shown = !this.shown; this.shown = !this.shown;
this.setData(); this.setData();
if (isFocused && this.platform.is('android')) {
// In Android, the keyboard is closed when the input type changes. Focus it again.
setTimeout(() => {
this.domUtils.focusElement(this.input);
}, 400);
}
} }
} }