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 remote-tracking branch 'origin/master' into svetoslavtsenov/merge-release-in-master

Browse Source
This commit is contained in:
SvetoslavTsenov
2019-07-16 13:26:15 +03:00
parent 12fdb82ffe 5e14de6a4e
commit abc143eeac
22 changed files with 104 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tns-core-modules/ui/core/view-base/view-base.ts
View File

@@ -37,7 +37,7 @@ function ensuredomNodeModule(): void {
let styleScopeModule: typeof ssm;
function ensureStyleScopeModule() {
if (!styleScopeModule) {
styleScopeModule = require("ui/styling/style-scope");
styleScopeModule = require("../../styling/style-scope");
}
}

2
tns-core-modules/ui/core/view/view-common.ts
View File

@@ -34,7 +34,7 @@ import * as am from "../../animation";
let animationModule: typeof am;
function ensureAnimationModule() {
if (!animationModule) {
animationModule = require("ui/animation");
animationModule = require("../../animation");
}
}