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

Merge branch 'release' into mdonev-merge-release-resourceid-fix

Browse Source
This commit is contained in:
Manol Donev
2019-02-22 15:37:32 +02:00
parent f30198ac58 1ab39636a0
commit 2247e6d28b
2 changed files with 42 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gruntfile.js
View File

@ -38,8 +38,7 @@ module.exports = function(grunt) {
return processed; return processed;
}; };
var updatePackageDef = function(content, update) var updatePackageDef = function (content, update) {
{
var contentAsObject = JSON.parse(content); var contentAsObject = JSON.parse(content);
update(contentAsObject); update(contentAsObject);
return JSON.stringify(contentAsObject, null, "\t"); return JSON.stringify(contentAsObject, null, "\t");
@ -258,7 +257,6 @@ module.exports = function(grunt) {
expand: true, expand: true,
src: [ src: [
'**/*', '**/*',
'!*.md',
'!node_modules/**/*', '!node_modules/**/*',
'!unit-tests/**/*', '!unit-tests/**/*',
], ],
@ -267,6 +265,10 @@ module.exports = function(grunt) {
} }
}, },
exec: { exec: {
copyReadme: {
cmd: `cp "README.md" ${localCfg.outTnsCoreModules}`,
cwd: process.cwd()
},
packModules: { packModules: {
cmd: "npm pack", cmd: "npm pack",
cwd: localCfg.outTnsCoreModules + "/" cwd: localCfg.outTnsCoreModules + "/"
@ -376,6 +378,7 @@ module.exports = function(grunt) {
"compile-modules", "compile-modules",
"run-unit-test", "run-unit-test",
"copy:modulesPackageDef", "copy:modulesPackageDef",
"exec:copyReadme",
"exec:packModules" "exec:packModules"
]); ]);

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;
} }