javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-08-19 23:13:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent d551693726 9ec404225e
commit 3ae12184e5
51 changed files with 122 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/core/ui/frame/activity.android.ts
View File

@ -1,6 +1,5 @@
import '../../globals';
import { setActivityCallbacks, AndroidActivityCallbacks } from '.';
// eslint-disable-next-line @typescript-eslint/no-var-requires
const appModule = require('../../application');
/**

1
packages/core/ui/frame/frame-common.ts
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);

1
packages/core/ui/frame/index.android.ts
View File

@ -41,7 +41,6 @@ let fragmentId = -1;
export let moduleLoaded: boolean;
if (global && global.__inspector) {
// eslint-disable-next-line @typescript-eslint/no-var-requires
const devtools = require('../../debugger/devtools-elements');
devtools.attachDOMInspectorEventCallbacks(global.__inspector);
devtools.attachDOMInspectorCommandCallbacks(global.__inspector);