Merge branch 'master' of github.com:NativeScript/NativeScript

# Conflicts:
#	.eslintrc.json
#	packages/core/ui/core/bindable/index.ts
#	tsconfig.eslint.json
This commit is contained in:
Martin Guillon
2021-05-05 10:17:27 +02:00
51 changed files with 122 additions and 92 deletions

View File

@ -289,7 +289,6 @@ export class FrameBase extends CustomLayoutView {
}
private isNestedWithin(parentFrameCandidate: FrameBase): boolean {
// eslint-disable-next-line @typescript-eslint/no-this-alias
let frameAncestor: FrameBase = this;
while (frameAncestor) {
frameAncestor = <FrameBase>getAncestor(frameAncestor, FrameBase);