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 crash on API17 and API21-25

Browse Source
This commit is contained in:
Hristo Hristov
2017-12-11 11:08:25 +02:00
parent ac04ede97e
commit 0abfb1493c
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/app/ui/view/view-tests-common.ts
View File

@@ -280,7 +280,6 @@ const customShortHandProperty = new ShorthandProperty<Style, string>({
name: "customShortHand",
cssName: "custom-short-hand",
converter(value: string): [CssProperty<any, any>, any][] {
console.log("Convert: " + value);
const values = value.split(",");
return [
[customCssAProperty, values[0]],

5
tns-core-modules/ui/frame/fragment.transitions.android.ts
View File

@@ -204,10 +204,11 @@ export function _onFragmentCreateAnimator(entry: ExpandedEntry, fragment: androi
if (!animator && sdkVersion() >= 21) {
const view = fragment.getView();
const parent = view.getParent();
const jsParent = entry.resolvedPage.parent;
const parent = view.getParent() || (jsParent && jsParent.nativeViewProtected);
const animatedEntries = _getAnimatedEntries(entry.frameId);
if (!animatedEntries || !animatedEntries.has(entry)) {
if (!(<any>parent).isLaidOut()) {
if (parent && !(<any>parent).isLaidOut()) {
animator = enter ? entry.defaultEnterAnimator : entry.defaultExitAnimator;
}
}

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

@@ -185,6 +185,7 @@ function initializeNativeClasses() {
(<any>this.mCurTransaction).commitNowAllowingStateLoss();
} else {
this.mCurTransaction.commitAllowingStateLoss();
this.owner._getFragmentManager().executePendingTransactions();
}
this.mCurTransaction = null;