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

Renamed closeDialog to closeModal; as we do a showModal; for consistency.

Browse Source 
Fixed page auto sizing full on Android.
This commit is contained in:
Nathanael Anderson
2015-09-23 15:22:34 -05:00
committed by Rossen Hristov
parent 5d3d772462
commit 7366e546dc
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ui/page/page-common.ts
View File

@ -33,9 +33,10 @@ export class Page extends contentView.ContentView implements dts.Page {
public static navigatedFromEvent = "navigatedFrom"; public static navigatedFromEvent = "navigatedFrom";
public static shownModallyEvent = "shownModally"; public static shownModallyEvent = "shownModally";
protected _closeModalCallback: Function;
private _navigationContext: any; private _navigationContext: any;
private _closeDialogCallback: Function;
private _cssApplied: boolean; private _cssApplied: boolean;
private _styleScope: styleScope.StyleScope = new styleScope.StyleScope(); private _styleScope: styleScope.StyleScope = new styleScope.StyleScope();
private _actionBar: actionBar.ActionBar; private _actionBar: actionBar.ActionBar;
@ -190,9 +191,9 @@ export class Page extends contentView.ContentView implements dts.Page {
(<Page>page)._showNativeModalView(this, context, closeCallback, fullscreen); (<Page>page)._showNativeModalView(this, context, closeCallback, fullscreen);
} }
public closeDialog() { public closeModal() {
if (this._closeDialogCallback) { if (this._closeModalCallback) {
this._closeDialogCallback.apply(undefined, arguments); this._closeModalCallback.apply(undefined, arguments);
} }
} }
@ -207,9 +208,9 @@ export class Page extends contentView.ContentView implements dts.Page {
protected _showNativeModalView(parent: Page, context: any, closeCallback: Function, fullscreen?: boolean) { protected _showNativeModalView(parent: Page, context: any, closeCallback: Function, fullscreen?: boolean) {
var that = this; var that = this;
this._closeDialogCallback = function () { this._closeModalCallback = function () {
if (that._closeDialogCallback) { if (that._closeModalCallback) {
that._closeDialogCallback = null; that._closeModalCallback = null;
that._hideNativeModalView(parent); that._hideNativeModalView(parent);
if (typeof closeCallback === "function") { if (typeof closeCallback === "function") {
closeCallback.apply(undefined, arguments); closeCallback.apply(undefined, arguments);
@ -227,7 +228,7 @@ export class Page extends contentView.ContentView implements dts.Page {
eventName: Page.shownModallyEvent, eventName: Page.shownModallyEvent,
object: this, object: this,
context: context, context: context,
closeCallback: this._closeDialogCallback closeCallback: this._closeModalCallback
}); });
} }

8
ui/page/page.android.ts
View File

@ -65,7 +65,11 @@ export class Page extends pageCommon.Page {
public _createUI() { public _createUI() {
this._grid = new org.nativescript.widgets.GridLayout(this._context); this._grid = new org.nativescript.widgets.GridLayout(this._context);
this._grid.addRow(new org.nativescript.widgets.ItemSpec(1, org.nativescript.widgets.GridUnitType.auto)); this._grid.addRow(new org.nativescript.widgets.ItemSpec(1, org.nativescript.widgets.GridUnitType.auto));
this._grid.addRow(new org.nativescript.widgets.ItemSpec(1, org.nativescript.widgets.GridUnitType.star)); var gridUnitType = org.nativescript.widgets.GridUnitType.star
if (this._closeModalCallback) {
gridUnitType = org.nativescript.widgets.GridUnitType.auto;
}
this._grid.addRow(new org.nativescript.widgets.ItemSpec(1, gridUnitType));
} }
public _addViewToNativeVisualTree(child: view.View, atIndex?: number): boolean { public _addViewToNativeVisualTree(child: view.View, atIndex?: number): boolean {
@ -116,7 +120,7 @@ export class Page extends pageCommon.Page {
var that = this; var that = this;
this._dialogFragment = new DialogFragmentClass(this, fullscreen, function() { this._dialogFragment = new DialogFragmentClass(this, fullscreen, function() {
that.closeDialog(); that.closeModal();
}); });
this._dialogFragment.show(parent.frame.android.activity.getFragmentManager(), "dialog"); this._dialogFragment.show(parent.frame.android.activity.getFragmentManager(), "dialog");