From 0905858d7d98e97606d87dcdcd331a4a23221c07 Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Mon, 20 Feb 2017 14:34:46 +0200
Subject: [PATCH 1/2] Add flexbox-layout module to bundle-entry-points

---
 tns-core-modules/bundle-entry-points.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tns-core-modules/bundle-entry-points.ts b/tns-core-modules/bundle-entry-points.ts
index aadbe3c12..0b2fe60ad 100644
--- a/tns-core-modules/bundle-entry-points.ts
+++ b/tns-core-modules/bundle-entry-points.ts
@@ -19,6 +19,7 @@ if (global.TNS_WEBPACK) {
     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/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/page", () => require("ui/page"))
     global.registerModule("ui/placeholder", () => require("ui/placeholder"))

From b9c0d33b3ac43f1cf26c0f13d9a9609caed2ccdd Mon Sep 17 00:00:00 2001
From: Hristo Deshev <hristo@deshev.com>
Date: Mon, 20 Feb 2017 16:58:11 +0200
Subject: [PATCH 2/2] Fix a crash on Button tap - reexport TouchAction

---
 tns-core-modules/ui/button/button-common.ts  |  2 +-
 tns-core-modules/ui/button/button.android.ts |  2 +-
 tns-core-modules/ui/core/view-common.ts      | 17 ++++++++++++++---
 3 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/tns-core-modules/ui/button/button-common.ts b/tns-core-modules/ui/button/button-common.ts
index fc253eff9..bf1e28dd0 100644
--- a/tns-core-modules/ui/button/button-common.ts
+++ b/tns-core-modules/ui/button/button-common.ts
@@ -12,4 +12,4 @@ export abstract class ButtonBase extends TextBase implements ButtonDefinition {
     set textWrap(value: boolean) {
         this.style.whiteSpace = value ? WhiteSpace.NORMAL : WhiteSpace.NO_WRAP;
     }
-}
\ No newline at end of file
+}
diff --git a/tns-core-modules/ui/button/button.android.ts b/tns-core-modules/ui/button/button.android.ts
index fe1a01f54..7a167a730 100644
--- a/tns-core-modules/ui/button/button.android.ts
+++ b/tns-core-modules/ui/button/button.android.ts
@@ -107,4 +107,4 @@ export class Button extends ButtonBase {
             this.nativeView.setStateListAnimator(null);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/tns-core-modules/ui/core/view-common.ts b/tns-core-modules/ui/core/view-common.ts
index 5e977a41d..6bd6d2b21 100644
--- a/tns-core-modules/ui/core/view-common.ts
+++ b/tns-core-modules/ui/core/view-common.ts
@@ -7,7 +7,13 @@ import {
     Property, CssProperty, CssAnimationProperty, ShorthandProperty, InheritedCssProperty,
     gestureFromString, isIOS, traceEnabled, traceWrite, traceCategories, makeParser, makeValidator
 } 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";
 
 // Only types:
@@ -21,8 +27,13 @@ export { layout };
 export * from "./view-base";
 
 export {
-    GestureTypes, GesturesObserver, GestureEventData,
-    Background, Font, Color
+    GestureTypes,
+    GesturesObserver,
+    GestureEventData,
+    TouchAction,
+    Background,
+    Font,
+    Color,
 }
 
 import * as am from "ui/animation";