Skip to content

Fix DAP issues for Modal #161

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

Merged
merged 4 commits into from
Oct 16, 2018
Merged

Fix DAP issues for Modal #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7beb30
Issue #114 - Fix DAP issues for Modal
aradhikaIbm Oct 8, 2018
e81589b
Merge branch 'master' into modal-dap-fixes
aradhikaIbm Oct 12, 2018
d9cf85c
resolve indentation
aradhikaIbm Oct 15, 2018
593099f
Merge branch 'master' into modal-dap-fixes
zvonimirfras Oct 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modal/alert-modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import Modal from "./modal.decorator";
@Component({
selector: "ibm-alert-modal",
template: `
<ibm-modal [modalType]="modalType">
<ibm-modal [modalType]="modalType" [modalLabel]="modalTitle">
<ibm-modal-header (closeSelect)="closeModal()">
<p class="bx--modal-header__label bx--type-delta">{{modalLabel}}</p>
<p class="bx--modal-header__heading bx--type-beta">{{modalTitle}}</p>
Expand Down
2 changes: 1 addition & 1 deletion src/modal/modal-footer.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { Component } from "@angular/core";
@Component({
selector: "ibm-modal-footer",
template: `
<footer role="contentinfo" class="bx--modal-footer">
<footer class="bx--modal-footer">
<ng-content></ng-content>
</footer>
`
Expand Down
2 changes: 1 addition & 1 deletion src/modal/modal-header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import { Component, Output, EventEmitter, Input } from "@angular/core";
@Component({
selector: "ibm-modal-header",
template: `
<header class="{{modalType}} bx--modal-header" role="banner">
<header class="{{modalType}} bx--modal-header">
<div class="bx--modal-header">
<ng-content></ng-content>
</div>
Expand Down
10 changes: 9 additions & 1 deletion src/modal/modal.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,11 @@ import { cycleTabs } from "./../common/tab.service";
<div
class="bx--modal-container"
[@modalState]="modalState"
role="main"
role="dialog"
aria-modal="true"
tabindex="0"
style="z-index:1;"
[attr.aria-label]="modalLabel"
#modal>
<ng-content></ng-content>
</div>
Expand Down Expand Up @@ -125,6 +126,13 @@ export class ModalComponent implements AfterViewInit, OnInit, OnDestroy {
* @memberof ModalComponent
*/
@Input() modalType = "default";

/**
* Label for the modal.
* @memberof ModalComponent
*/
@Input() modalLabel = "default";

/**
* Emits event when click occurs within `n-overlay` element. This is to track click events occuring outside bounds of the `Modal` object.
* @memberof ModalComponent
Expand Down