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

Merge pull request #6958 from NativeScript/mdonev-merge-release-resourceid-fix

Browse Source 
chore: merge release in master
This commit is contained in:
Svetoslav
2019-02-24 18:28:59 +02:00
committed by GitHub
parent e27d0be7e9 1f613d4401
commit 23147aecf3
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -114,8 +114,9 @@ export function _setAndroidFragmentTransitions(
let currentFragmentNeedsDifferentAnimation = false; let currentFragmentNeedsDifferentAnimation = false;
if (currentEntry) { if (currentEntry) {
_updateTransitions(currentEntry); _updateTransitions(currentEntry);
if (currentEntry.transitionName !== name if (currentEntry.transitionName !== name ||
|| currentEntry.transition !== transition) { currentEntry.transition !== transition ||
!useLollipopTransition) {
clearExitAndReenterTransitions(currentEntry, true); clearExitAndReenterTransitions(currentEntry, true);
currentFragmentNeedsDifferentAnimation = true; currentFragmentNeedsDifferentAnimation = true;
} }