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

Merge pull request #3668 from NativeScript/hdeshev/bundle-fixes

Browse Source 
Bundle fixes
This commit is contained in:
Hristo Deshev
2017-02-20 17:56:49 +02:00
committed by GitHub
parent a4af27946b b9c0d33b3a
commit 3fc3fe6b78
4 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tns-core-modules/bundle-entry-points.ts
View File

@ -19,6 +19,7 @@ if (global.TNS_WEBPACK) {
global.registerModule("ui/layouts/dock-layout", () => require("ui/layouts/dock-layout")) global.registerModule("ui/layouts/dock-layout", () => require("ui/layouts/dock-layout"))
global.registerModule("ui/layouts/grid-layout", () => require("ui/layouts/grid-layout")) global.registerModule("ui/layouts/grid-layout", () => require("ui/layouts/grid-layout"))
global.registerModule("ui/layouts/stack-layout", () => require("ui/layouts/stack-layout")) global.registerModule("ui/layouts/stack-layout", () => require("ui/layouts/stack-layout"))
global.registerModule("ui/layouts/flexbox-layout", () => require("ui/layouts/flexbox-layout"))
global.registerModule("ui/list-picker", () => require("ui/list-picker")) global.registerModule("ui/list-picker", () => require("ui/list-picker"))
global.registerModule("ui/page", () => require("ui/page")) global.registerModule("ui/page", () => require("ui/page"))
global.registerModule("ui/placeholder", () => require("ui/placeholder")) global.registerModule("ui/placeholder", () => require("ui/placeholder"))

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

@ -12,4 +12,4 @@ export abstract class ButtonBase extends TextBase implements ButtonDefinition {
set textWrap(value: boolean) { set textWrap(value: boolean) {
this.style.whiteSpace = value ? WhiteSpace.NORMAL : WhiteSpace.NO_WRAP; this.style.whiteSpace = value ? WhiteSpace.NORMAL : WhiteSpace.NO_WRAP;
} }
} }

2
tns-core-modules/ui/button/button.android.ts
View File

@ -107,4 +107,4 @@ export class Button extends ButtonBase {
this.nativeView.setStateListAnimator(null); this.nativeView.setStateListAnimator(null);
} }
} }
} }

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

@ -7,7 +7,13 @@ import {
Property, CssProperty, CssAnimationProperty, ShorthandProperty, InheritedCssProperty, Property, CssProperty, CssAnimationProperty, ShorthandProperty, InheritedCssProperty,
gestureFromString, isIOS, traceEnabled, traceWrite, traceCategories, makeParser, makeValidator gestureFromString, isIOS, traceEnabled, traceWrite, traceCategories, makeParser, makeValidator
} from "./view-base"; } from "./view-base";
import { observe as gestureObserve, GesturesObserver, GestureTypes, GestureEventData } from "ui/gestures"; import {
observe as gestureObserve,
GesturesObserver,
GestureTypes,
GestureEventData,
TouchAction
} from "ui/gestures";
import { Font, parseFont, FontStyle, FontWeight } from "ui/styling/font"; import { Font, parseFont, FontStyle, FontWeight } from "ui/styling/font";
// Only types: // Only types:
@ -21,8 +27,13 @@ export { layout };
export * from "./view-base"; export * from "./view-base";
export { export {
GestureTypes, GesturesObserver, GestureEventData, GestureTypes,
Background, Font, Color GesturesObserver,
GestureEventData,
TouchAction,
Background,
Font,
Color,
} }
import * as am from "ui/animation"; import * as am from "ui/animation";