Skip to content

Commit 8d9a6f3

Browse files
NeoCoderMatrix86NeoCoderMatrix86
committed
fix double injection to razor pages
1 parent 20b8794 commit 8d9a6f3

7 files changed

Lines changed: 19 additions & 26 deletions

File tree

‎AudioCuesheetEditor/Pages/Index.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ along with Foobar. If not, see
2121
@inherits BaseLocalizedComponent
2222

2323
@inject IStringLocalizer<Index> _localizer
24-
@inject ILocalStorageOptionsProvider _localStorageOptionsProvider
2524

2625
<CascadingValue Value="currentViewmode">
2726
<MudTabs Rounded ApplyEffectsToContainer Outlined Color="Color.Success" ActivePanelIndex="(int)currentViewmode" ActivePanelIndexChanged="this.AsNonRenderingEventHandler<int>(ActiveTabIndexChanged)">
@@ -44,17 +43,17 @@ along with Foobar. If not, see
4443
protected override async Task OnInitializedAsync()
4544
{
4645
await base.OnInitializedAsync();
47-
options = await _localStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
46+
options = await base.LocalStorageOptionsProvider.GetOptionsAsync<ViewOptions>();
4847
currentViewmode = options.ActiveTab;
49-
_localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
48+
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
5049
}
5150

5251
protected override void Dispose(bool disposing)
5352
{
5453
base.Dispose(disposing);
5554
if (disposing)
5655
{
57-
_localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
56+
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
5857
}
5958
}
6059

‎AudioCuesheetEditor/Shared/Dialogs/DownloadProjectfileDialog.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ along with Foobar. If not, see
2121
@inject ISessionStateContainer _sessionStateContainer
2222
@inject IBlazorDownloadFileService _blazorDownloadFileService
2323
@inject ValidationService _validationService
24-
@inject ILocalStorageOptionsProvider _localStorageOptionsProvider
2524

2625
<MudDialog>
2726
<DialogContent>
@@ -42,14 +41,14 @@ along with Foobar. If not, see
4241
protected override async Task OnInitializedAsync()
4342
{
4443
await base.OnInitializedAsync();
45-
options = await _localStorageOptionsProvider.GetOptionsAsync<DownloadOptions>();
46-
_localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
44+
options = await base.LocalStorageOptionsProvider.GetOptionsAsync<DownloadOptions>();
45+
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
4746
}
4847

4948
protected override void Dispose(bool disposing)
5049
{
5150
base.Dispose(disposing);
52-
_localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
51+
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
5352
}
5453

5554
async Task DownloadProjectClick()

‎AudioCuesheetEditor/Shared/Dialogs/GenerateCuesheetDialog.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ along with Foobar. If not, see
2222
@inject ValidationService _validationService
2323
@inject IBlazorDownloadFileService _blazorDownloadFileService
2424
@inject CuesheetExportService _cuesheetExportService
25-
@inject ILocalStorageOptionsProvider _localStorageOptionsProvider
2625

2726
<MudDialog>
2827
<DialogContent>
@@ -64,15 +63,15 @@ along with Foobar. If not, see
6463
protected override async Task OnInitializedAsync()
6564
{
6665
await base.OnInitializedAsync();
67-
options = await _localStorageOptionsProvider.GetOptionsAsync<DownloadOptions>();
68-
_localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
66+
options = await base.LocalStorageOptionsProvider.GetOptionsAsync<DownloadOptions>();
67+
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
6968
exportfiles = _cuesheetExportService.GenerateExportfiles(options?.CuesheetFilename);
7069
}
7170

7271
protected override void Dispose(bool disposing)
7372
{
7473
base.Dispose(disposing);
75-
_localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
74+
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
7675
}
7776

7877
String? GetValidationErrorMessage()

‎AudioCuesheetEditor/Shared/Dialogs/SettingsDialog.razor‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ along with Foobar. If not, see
1919

2020
@inject IStringLocalizer<SettingsDialog> _localizer
2121
@inject ValidationService _validationService
22-
@inject ILocalStorageOptionsProvider _localStorageOptionsProvider
2322

2423
<MudDialog>
2524
<DialogContent>

‎AudioCuesheetEditor/Shared/Dialogs/StartRecordCountdownDialog.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ along with Foobar. If not, see
1818
@inherits BaseLocalizedComponent
1919

2020
@inject IStringLocalizer<StartRecordCountdownDialog> _localizer
21-
@inject ILocalStorageOptionsProvider _localStorageOptionsProvider
2221

2322
<MudDialog>
2423
<TitleContent>
@@ -43,14 +42,14 @@ along with Foobar. If not, see
4342
protected override async Task OnInitializedAsync()
4443
{
4544
await base.OnInitializedAsync();
46-
options = await _localStorageOptionsProvider.GetOptionsAsync<RecordOptions>();
47-
_localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
45+
options = await base.LocalStorageOptionsProvider.GetOptionsAsync<RecordOptions>();
46+
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
4847
}
4948

5049
protected override void Dispose(bool disposing)
5150
{
5251
base.Dispose(disposing);
53-
_localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
52+
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
5453
}
5554

5655
void LocalStorageOptionsProvider_OptionSaved(object? sender, IOptions option)

‎AudioCuesheetEditor/Shared/Import/Importprofiles.razor‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ along with Foobar. If not, see
2121
@inject IStringLocalizer<Importprofiles> _localizer
2222
@inject ValidationService _validationService
2323
@inject IDialogService _dialogService
24-
@inject ILocalStorageOptionsProvider _localStorageOptionsProvider
2524

2625
@if (importOptions != null)
2726
{
@@ -96,14 +95,14 @@ along with Foobar. If not, see
9695
protected override async Task OnInitializedAsync()
9796
{
9897
await base.OnInitializedAsync();
99-
importOptions = await _localStorageOptionsProvider.GetOptionsAsync<ImportOptions>();
100-
_localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
98+
importOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ImportOptions>();
99+
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
101100
}
102101

103102
protected override void Dispose(bool disposing)
104103
{
105104
base.Dispose(disposing);
106-
_localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
105+
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
107106
}
108107

109108
void AppendPlaceholderToTextField(MudTextField<string>? mudTextField, string placeholder)

‎AudioCuesheetEditor/Shared/TrackList/TrackList.razor‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ along with Foobar. If not, see
2323
@inject AutocompleteManager _autocompleteManager
2424
@inject DialogManager _editTrackModalManager
2525
@inject ValidationService _validationService
26-
@inject ILocalStorageOptionsProvider _localStorageOptionsProvider
2726
@inject PlaybackService _playbackService
2827
@inject IDialogService _dialogService
2928
@inject ISessionStateContainer _sessionStateContainer
@@ -50,7 +49,7 @@ along with Foobar. If not, see
5049
MoveTracksUpDisabled="!(Cuesheet?.MoveTracksPossible(selectedTracks, MoveDirection.Up) == true)" MoveTracksUpClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Up)"
5150
MoveTracksDownDisabled="!(Cuesheet?.MoveTracksPossible(selectedTracks, MoveDirection.Down) == true)" MoveTracksDownClicked="() => Cuesheet?.MoveTracks(selectedTracks, MoveDirection.Down)"
5251
CopySelectedTracksDisabled="selectedTracks.Count != 1" CopySelectedTracksClicked="() => CopyTrackClicked()"
53-
FixedHeader="applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => _localStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !applicationOptions?.FixedTracksTableHeader)" />
52+
FixedHeader="applicationOptions?.FixedTracksTableHeader == true" FixedHeaderClicked="() => base.LocalStorageOptionsProvider.SaveOptionsValueAsync<ApplicationOptions>(x => x.FixedTracksTableHeader, !applicationOptions?.FixedTracksTableHeader)" />
5453
</div>
5554
break;
5655
}
@@ -162,16 +161,16 @@ along with Foobar. If not, see
162161
protected override void Dispose(bool disposing)
163162
{
164163
base.Dispose(disposing);
165-
_localStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
164+
base.LocalStorageOptionsProvider.OptionSaved -= LocalStorageOptionsProvider_OptionSaved;
166165
_sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
167166
_sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
168167
}
169168

170169
protected override async Task OnInitializedAsync()
171170
{
172171
await base.OnInitializedAsync();
173-
applicationOptions = await _localStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
174-
_localStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
172+
applicationOptions = await base.LocalStorageOptionsProvider.GetOptionsAsync<ApplicationOptions>();
173+
base.LocalStorageOptionsProvider.OptionSaved += LocalStorageOptionsProvider_OptionSaved;
175174
_sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
176175
_sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
177176
}

0 commit comments

Comments
 (0)