Skip to content

Commit

Permalink
Merge pull request #633 from louistio/rename-aysnc-to-async
Browse files Browse the repository at this point in the history
Rename methods with "Aysnc" to "Async"
  • Loading branch information
nigel-sampson authored Sep 9, 2019
2 parents 7758a9e + 647929f commit 3db4048
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ protected virtual async Task ActivateViewAsync(BindableObject view)
/// <returns>The asynchrous task representing the transition</returns>
public async Task GoBackAsync(bool animated = true) {

var canClose = await CanCloseAysnc();
var canClose = await CanCloseAsync();

if (!canClose)
return;
Expand All @@ -120,7 +120,7 @@ public async Task GoBackAsync(bool animated = true) {
/// <returns>The asynchrous task representing the transition</returns>
public async Task GoBackToRootAsync(bool animated = true)
{
var canClose = await CanCloseAysnc();
var canClose = await CanCloseAsync();

if (!canClose)
return;
Expand All @@ -137,7 +137,7 @@ public async Task GoBackToRootAsync(bool animated = true)
/// <returns>The asynchrous task representing the transition</returns>
public async Task NavigateToViewModelAsync(Type viewModelType, object parameter = null, bool animated = true)
{
var canClose = await CanCloseAysnc();
var canClose = await CanCloseAsync();

if (!canClose)
return;
Expand All @@ -156,7 +156,7 @@ public async Task NavigateToViewModelAsync(Type viewModelType, object parameter
/// <returns>The asynchrous task representing the transition</returns>
public async Task NavigateToViewModelAsync<T>(object parameter = null, bool animated = true)
{
var canClose = await CanCloseAysnc();
var canClose = await CanCloseAsync();

if (!canClose)
return;
Expand All @@ -173,7 +173,7 @@ public async Task NavigateToViewModelAsync<T>(object parameter = null, bool anim
/// <returns>The asynchrous task representing the transition</returns>
public async Task NavigateToViewAsync(Type viewType, object parameter = null, bool animated = true)
{
var canClose = await CanCloseAysnc();
var canClose = await CanCloseAsync();

if (!canClose)
return;
Expand All @@ -192,7 +192,7 @@ public async Task NavigateToViewAsync(Type viewType, object parameter = null, bo
/// <returns>The asynchrous task representing the transition</returns>
public async Task NavigateToViewAsync<T>(object parameter = null, bool animated = true)
{
var canClose = await CanCloseAysnc();
var canClose = await CanCloseAsync();

if (!canClose)
return;
Expand Down Expand Up @@ -278,7 +278,7 @@ protected virtual void TryInjectParameters(object viewModel, object parameter)
}
}

private async Task<bool> CanCloseAysnc() {
private async Task<bool> CanCloseAsync() {
var view = navigationPage.CurrentPage;

if (view?.BindingContext is IGuardClose guard)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ protected virtual async Task<Window> CreateWindowAsync(object rootModel, bool is

var conductor = new WindowConductor(rootModel, view);

await conductor.InitialiseAysnc();
await conductor.InitialiseAsync();

return view;
}
Expand Down Expand Up @@ -332,7 +332,7 @@ public WindowConductor(object model, Window view)
this.view = view;
}

public async Task InitialiseAysnc()
public async Task InitialiseAsync()
{
if (model is IActivate activator)
{
Expand Down
4 changes: 2 additions & 2 deletions src/Caliburn.Micro.Platform/Platforms/net46/WindowManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ protected virtual async Task<Window> CreateWindowAsync(object rootModel, bool is

var conductor = new WindowConductor(rootModel, view);

await conductor.InitialiseAysnc();
await conductor.InitialiseAsync();

return view;
}
Expand Down Expand Up @@ -332,7 +332,7 @@ public WindowConductor(object model, Window view)
this.view = view;
}

public async Task InitialiseAysnc()
public async Task InitialiseAsync()
{
if (model is IActivate activator)
{
Expand Down

0 comments on commit 3db4048

Please sign in to comment.