Skip to content

fix(tpd-11668): viewchild not ready issue fixed #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tundealtfatter wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(tpd-11668): viewchild not ready issue fixed #114

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions lib/captcha.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import {
Output,
EventEmitter,
NgZone,
ViewChild, ElementRef, forwardRef
ViewChild, ElementRef, forwardRef,
AfterViewInit
} from '@angular/core';
import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms';
import { ReCaptchaService } from './captcha.service';
Expand All @@ -21,7 +22,7 @@ import { ReCaptchaService } from './captcha.service';
}
]
})
export class ReCaptchaComponent implements OnInit, ControlValueAccessor {
export class ReCaptchaComponent implements OnInit, AfterViewInit, ControlValueAccessor {

@Input() site_key: string = null;
@Input() theme = 'light';
Expand Down Expand Up @@ -50,26 +51,29 @@ export class ReCaptchaComponent implements OnInit, ControlValueAccessor {
}

ngOnInit() {
}

ngAfterViewInit(): void {
this._captchaService.getReady(this.language, this.global)
.subscribe((ready) => {
if (!ready)
return;
// noinspection TypeScriptUnresolvedVariable,TypeScriptUnresolvedFunction
this.widgetId = (<any>window).grecaptcha.render(this.targetRef.nativeElement, {
'sitekey': this.site_key,
'badge': this.badge,
'theme': this.theme,
'type': this.type,
'size': this.size,
'tabindex': this.tabindex,
'callback': <any>((response: any) => this._zone.run(this.recaptchaCallback.bind(this, response))),
'expired-callback': <any>(() => this._zone.run(this.recaptchaExpiredCallback.bind(this)))
});
setTimeout(() => {
this.loaded.emit(true);
}, 0);
.subscribe((ready) => {
if (!ready)
return;
// noinspection TypeScriptUnresolvedVariable,TypeScriptUnresolvedFunction
this.widgetId = (<any>window).grecaptcha.render(this.targetRef.nativeElement, {
'sitekey': this.site_key,
'badge': this.badge,
'theme': this.theme,
'type': this.type,
'size': this.size,
'tabindex': this.tabindex,
'callback': <any>((response: any) => this._zone.run(this.recaptchaCallback.bind(this, response))),
'expired-callback': <any>(() => this._zone.run(this.recaptchaExpiredCallback.bind(this)))
});
}
setTimeout(() => {
this.loaded.emit(true);
}, 0);
});
}

// noinspection JSUnusedGlobalSymbols
public reset() {
Expand Down