Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to use the full bootstrap modal in the sample #247

Merged
merged 2 commits into from
Oct 31, 2020
Merged

Update to use the full bootstrap modal in the sample #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55bb1c2
Update to use the full bootstrap modal in the sample
chrissainty Oct 31, 2020
3aa5ed4
Merge branch 'main' into improvements-to-custom-modal-sample
chrissainty Oct 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 17 additions & 15 deletions samples/BlazorServer/Shared/CustomBootstrapModal.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
<div class="modal-backdrop fade show" @onclick="Cancel"></div>
<div class="modal fade show d-block" style="pointer-events: none;" tabindex="-1" role="dialog">
<div class="modal-dialog " role="document">
<div class="modal-content border-primary">
<div class="modal-header bg-primary text-white">
<h5 class="modal-title">@BlazoredModal.Title</h5>
<button type="button" class="close" aria-label="Close" @onclick="Close">
<span aria-hidden="true">&times;</span>
</button>

</div>
<div class="modal-body">
@Message
</div>

</div>
<div class="modal fade show d-block" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Modal title</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>@Message</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" @onclick="Close">Close</button>
</div>
</div>
</div>
</div>

@code {

[CascadingParameter] BlazoredModalInstance BlazoredModal { get; set; }
Expand Down
2 changes: 1 addition & 1 deletion samples/BlazorWebAssembly/Pages/CustomLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
{
var options = new ModalOptions { UseCustomLayout = true };
var parameters = new ModalParameters();
parameters.Add(nameof(CustomBootstrapModal.Message), "Hello custom modal!!");
parameters.Add(nameof(CustomBootstrapModal.Message), "Hello Bootstrap modal!!");
Modal.Show<CustomBootstrapModal>("Custom Layout", parameters, options);
}

Expand Down
36 changes: 19 additions & 17 deletions samples/BlazorWebAssembly/Shared/CustomBootstrapModal.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,30 @@
<div class="modal-backdrop fade show" @onclick="Cancel"></div>
<div class="modal fade show d-block" style="pointer-events: none;" tabindex="-1" role="dialog">
<div class="modal-dialog " role="document">
<div class="modal-content border-primary">
<div class="modal-header bg-primary text-white">
<h5 class="modal-title">@BlazoredModal.Title</h5>
<button type="button" class="close" aria-label="Close" @onclick="Close">
<span aria-hidden="true">&times;</span>
</button>

</div>
<div class="modal-body">
@Message
</div>

</div>
<div class="modal fade show d-block" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">Modal title</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p>@Message</p>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal" @onclick="Close">Close</button>
</div>
</div>
</div>
</div>

@code {

[CascadingParameter] BlazoredModalInstance BlazoredModal { get; set; }

[Parameter] public string Message { get; set; }

void Close() => BlazoredModal.Close(ModalResult.Ok(true));
void Cancel() => BlazoredModal.Cancel();
async Task Close() => await BlazoredModal.Close(ModalResult.Ok(true));
async Task Cancel() => await BlazoredModal.Cancel();

}