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

Fix broken merge conflict

Browse Source
This commit is contained in:
Hristo Hristov
2017-11-13 10:36:45 +02:00
parent 28f1a5875e
commit 04c1132541
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tns-core-modules/ui/core/view/view.ios.ts
View File

@@ -11,6 +11,7 @@ import { ios as iosBackground, Background } from "../../styling/background";
// HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to // HACK: Webpack. Use a fully-qualified import to allow resolve.extensions(.ios.js) to
// kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism. // kick in. `../utils` doesn't seem to trigger the webpack extensions mechanism.
import * as uiUtils from "tns-core-modules/ui/utils"; import * as uiUtils from "tns-core-modules/ui/utils";
import { ios as iosUtils } from "../../../utils/utils";
import { import {
Visibility, Visibility,
visibilityProperty, opacityProperty, visibilityProperty, opacityProperty,

2
tns-core-modules/ui/page/page.ios.ts
View File

@@ -434,7 +434,7 @@ export class Page extends PageBase {
public onLayout(left: number, top: number, right: number, bottom: number) { public onLayout(left: number, top: number, right: number, bottom: number) {
const { width: actionBarWidth, height: actionBarHeight } = this.actionBar._getActualSize; const { width: actionBarWidth, height: actionBarHeight } = this.actionBar._getActualSize;
View.layoutChild(this, this.actionBar, 0, 0, actionBarWidth, actionBarHeight); View.layoutChild(this, this.actionBar, 0, 0, actionBarWidth, actionBarHeight);
View.layoutChild(this, this.layoutView, 0, top, right - left, bottom); View.layoutChild(this, this.layoutView, 0, 0, right - left, bottom - top);
} }
public _addViewToNativeVisualTree(child: View, atIndex: number): boolean { public _addViewToNativeVisualTree(child: View, atIndex: number): boolean {