mirror of
https://github.com/NativeScript/NativeScript.git
synced 2025-11-05 13:26:48 +08:00
Merge branch 'master' of github.com:NativeScript/NativeScript
# Conflicts: # package.json # packages/core/bundle-entry-points.ts # packages/core/color/color-common.ts # packages/core/color/index.d.ts # packages/core/globals/index.ts # packages/core/package.json # packages/core/ui/core/bindable/index.ts # packages/core/ui/core/properties/index.ts # packages/core/ui/core/view/index.android.ts # packages/core/ui/frame/index.android.ts # packages/core/ui/styling/style-scope.ts # packages/ui-mobile-base/android/gradle/wrapper/gradle-wrapper.properties # packages/webpack5/package.json # packages/webpack5/src/configuration/base.ts
This commit is contained in:
@@ -28,7 +28,7 @@ let loaded = false;
|
||||
let isIn1 = false;
|
||||
|
||||
function updateVcToggleText() {
|
||||
vcToggle.text = `Container is${reusableItem.reusable ? ' ' : ' NOT '}Reusable`
|
||||
vcToggle.text = `Container is${reusableItem.reusable ? ' ' : ' NOT '}Reusable`;
|
||||
}
|
||||
|
||||
export function pageLoaded(args) {
|
||||
@@ -82,7 +82,7 @@ export function makeReusable(args: EventData) {
|
||||
}
|
||||
(args.object as any).___reusableRan = true;
|
||||
(args.object as any).reusable = true;
|
||||
if(args.object === reusableItem) {
|
||||
if (args.object === reusableItem) {
|
||||
updateVcToggleText();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user