From dde5fd6d5a628f4b06c59dbe3506ae7eb38c8d3a Mon Sep 17 00:00:00 2001 From: vakrilov Date: Tue, 14 Jul 2015 18:25:44 +0300 Subject: [PATCH] Renames --- ui/action-bar/action-bar-common.ts | 12 ++++++------ ui/action-bar/action-bar.android.ts | 4 ++-- ui/action-bar/action-bar.d.ts | 4 ++-- ui/action-bar/action-bar.ios.ts | 2 +- ui/frame/frame.android.ts | 2 +- ui/frame/frame.ios.ts | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/ui/action-bar/action-bar-common.ts b/ui/action-bar/action-bar-common.ts index 8433762f5..6220dff13 100644 --- a/ui/action-bar/action-bar-common.ts +++ b/ui/action-bar/action-bar-common.ts @@ -49,7 +49,7 @@ export class ActionBar extends view.View implements dts.ActionBar { this._navigationButton.actionBar = this; } - this.updateActionBar(); + this.update(); } } @@ -79,7 +79,7 @@ export class ActionBar extends view.View implements dts.ActionBar { this._addView(this._titleView); } - this.updateActionBar(); + this.update(); } } @@ -111,7 +111,7 @@ export class ActionBar extends view.View implements dts.ActionBar { public static onTitleChanged - public updateActionBar() { + public update() { // } @@ -119,7 +119,7 @@ export class ActionBar extends view.View implements dts.ActionBar { // } - public _updateAndroidActionBar(menu: android.view.IMenu) { + public _updateAndroid(menu: android.view.IMenu) { // } @@ -232,7 +232,7 @@ export class ActionItems implements dts.ActionItems { private invalidate() { if (this._actionBar) { - this._actionBar.updateActionBar(); + this._actionBar.update(); } } } @@ -249,7 +249,7 @@ export class ActionItemBase extends bindable.Bindable implements dts.ActionItemB private static onItemChanged(data: dependencyObservable.PropertyChangeData) { var menuItem = data.object; if (menuItem.actionBar) { - menuItem.actionBar.updateActionBar(); + menuItem.actionBar.update(); } } diff --git a/ui/action-bar/action-bar.android.ts b/ui/action-bar/action-bar.android.ts index 07bfb73f0..1e35dbb8a 100644 --- a/ui/action-bar/action-bar.android.ts +++ b/ui/action-bar/action-bar.android.ts @@ -81,7 +81,7 @@ export class ActionBar extends common.ActionBar { this._android = new AndroidActionBarSettings(this); } - public updateActionBar() { + public update() { if (this.page && this.page.frame && this.page.frame.android && this.page.frame.android.activity) { this.page.frame.android.activity.invalidateOptionsMenu(); } @@ -102,7 +102,7 @@ export class ActionBar extends common.ActionBar { return false; } - public _updateAndroidActionBar(menu: android.view.IMenu) { + public _updateAndroid(menu: android.view.IMenu) { var actionBar: android.app.ActionBar = frame.topmost().android.actionBar; this._addActionItems(menu); diff --git a/ui/action-bar/action-bar.d.ts b/ui/action-bar/action-bar.d.ts index 53d73e676..8c454ef4a 100644 --- a/ui/action-bar/action-bar.d.ts +++ b/ui/action-bar/action-bar.d.ts @@ -18,10 +18,10 @@ shouldShow(): boolean - updateActionBar(); + update(); //@private - _updateAndroidActionBar(menu: android.view.IMenu); + _updateAndroid(menu: android.view.IMenu); _onAndroidItemSelected(itemId: number): boolean _addArrayFromBuilder(name: string, value: Array): void; diff --git a/ui/action-bar/action-bar.ios.ts b/ui/action-bar/action-bar.ios.ts index 694613d06..92f9c4b4b 100644 --- a/ui/action-bar/action-bar.ios.ts +++ b/ui/action-bar/action-bar.ios.ts @@ -23,7 +23,7 @@ export class ActionItem extends common.ActionItemBase implements dts.ActionItem } export class ActionBar extends common.ActionBar { - public updateActionBar() { + public update() { // Page should be attached to frame to update the action bar. if (!(this.page && this.page.parent)) { return; diff --git a/ui/frame/frame.android.ts b/ui/frame/frame.android.ts index 5a8ee4b55..69c4ce723 100644 --- a/ui/frame/frame.android.ts +++ b/ui/frame/frame.android.ts @@ -140,7 +140,7 @@ class PageFragmentBody extends android.app.Fragment { var page: pages.Page = this.entry.resolvedPage; - page.actionBar._updateAndroidActionBar(menu); + page.actionBar._updateAndroid(menu); } onOptionsItemSelected(item: android.view.IMenuItem) { diff --git a/ui/frame/frame.ios.ts b/ui/frame/frame.ios.ts index 33680275e..61e553f7b 100644 --- a/ui/frame/frame.ios.ts +++ b/ui/frame/frame.ios.ts @@ -196,7 +196,7 @@ class UINavigationControllerImpl extends UINavigationController implements UINav throw new Error("Page is already shown on another frame."); } - newPage.actionBar.updateActionBar(); + newPage.actionBar.update(); } public navigationControllerDidShowViewControllerAnimated(navigationController: UINavigationController, viewController: UIViewController, animated: boolean): void {