From fc3cc266143730361abb77699e98814b8b3d1c07 Mon Sep 17 00:00:00 2001 From: Conor Wright Date: Thu, 13 Dec 2018 15:37:55 -0500 Subject: [PATCH 1/4] added before close docs to modals --- package.json | 9 +++++---- src/app/components/modal/index.html | 14 ++++++-------- 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index a2c5e9232..e32fe3407 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "1.0.0", "description": "Documentation for SKY UX", "engines": { - "node": ">=6.12.0" + "node": ">=6.11.1" }, "scripts": { "test": "skyux lint && skyux test && skyux e2e && skyux build" @@ -12,11 +12,12 @@ "author": "Blackbaud, Inc.", "license": "MIT", "dependencies": { - "@blackbaud/skyux": "2.27.0", - "@blackbaud/stache": "2.12.0" + "@blackbaud/skyux": "2.34.0", + "@blackbaud/skyux-design-tokens": "0.0.8", + "@blackbaud/stache": "2.7.2" }, "devDependencies": { - "@blackbaud/skyux-builder": "1.26.0" + "@blackbaud/skyux-builder": "1.30.0" }, "repository": { "type": "git", diff --git a/src/app/components/modal/index.html b/src/app/components/modal/index.html index 655263ad5..029d2fe70 100644 --- a/src/app/components/modal/index.html +++ b/src/app/components/modal/index.html @@ -39,7 +39,7 @@ propertyName="providers" > An array property of providers. In Angular, a provider is something that can create or deliver a service. This property can be used to pass context values from the component that launches the modal to the modal component. - A + A Sets the aria-describedby attribute for the modal dialog to support accessibility. The value should be an ID (without the leading #) that points to the element that describes the modal. Typically, this is the text on the modal, not including anything that users interact with such as buttons or a form. If no ID is specified, the default value is the content of the sky-modal-content component. - - Specifies an ARIA role for the modal dialog to support accessibility by indicating how the modal functions and what it controls. The ARIA role indicates what the modal component represents on the web page. For information about ARIA roles, see the WAI-ARIA roles model. - + + An event that the modal instance emits when it is about to close. It emits a SkyModalBeforeCloseHandler object with a closeModal method that completes the close of the modal. The modal will not close unless the closeModal method is called if there is a subscription to this event. + From 185633fe65df6c0f52fd165b38cf586a69f6ff7e Mon Sep 17 00:00:00 2001 From: Conor Wright Date: Thu, 13 Dec 2018 15:43:04 -0500 Subject: [PATCH 2/4] added differences back --- src/app/components/modal/index.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/app/components/modal/index.html b/src/app/components/modal/index.html index 029d2fe70..37c3ce6a8 100644 --- a/src/app/components/modal/index.html +++ b/src/app/components/modal/index.html @@ -39,7 +39,6 @@ propertyName="providers" > An array property of providers. In Angular, a provider is something that can create or deliver a service. This property can be used to pass context values from the component that launches the modal to the modal component. - A Sets the aria-describedby attribute for the modal dialog to support accessibility. The value should be an ID (without the leading #) that points to the element that describes the modal. Typically, this is the text on the modal, not including anything that users interact with such as buttons or a form. If no ID is specified, the default value is the content of the sky-modal-content component. + + Specifies an ARIA role for the modal dialog to support accessibility by indicating how the modal functions and what it controls. The ARIA role indicates what the modal component represents on the web page. For information about ARIA roles, see the WAI-ARIA roles model. + Date: Thu, 13 Dec 2018 15:44:14 -0500 Subject: [PATCH 3/4] fixed spacing --- src/app/components/modal/index.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/components/modal/index.html b/src/app/components/modal/index.html index 37c3ce6a8..6dc7e3ca5 100644 --- a/src/app/components/modal/index.html +++ b/src/app/components/modal/index.html @@ -61,11 +61,11 @@ Sets the aria-describedby attribute for the modal dialog to support accessibility. The value should be an ID (without the leading #) that points to the element that describes the modal. Typically, this is the text on the modal, not including anything that users interact with such as buttons or a form. If no ID is specified, the default value is the content of the sky-modal-content component. - Specifies an ARIA role for the modal dialog to support accessibility by indicating how the modal functions and what it controls. The ARIA role indicates what the modal component represents on the web page. For information about ARIA roles, see the WAI-ARIA roles model. + propertyName="ariaRole" + defaultValue="dialog" + isOptional="true" + > + Specifies an ARIA role for the modal dialog to support accessibility by indicating how the modal functions and what it controls. The ARIA role indicates what the modal component represents on the web page. For information about ARIA roles, see the WAI-ARIA roles model. Date: Fri, 14 Dec 2018 13:59:23 -0500 Subject: [PATCH 4/4] Wording tweaks --- src/app/components/modal/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/modal/index.html b/src/app/components/modal/index.html index 6dc7e3ca5..aa5560581 100644 --- a/src/app/components/modal/index.html +++ b/src/app/components/modal/index.html @@ -120,7 +120,7 @@ - An event that the modal instance emits when it is about to close. It emits a SkyModalBeforeCloseHandler object with a closeModal method that completes the close of the modal. The modal will not close unless the closeModal method is called if there is a subscription to this event. + An event that the modal instance emits when it is about to close. It emits a SkyModalBeforeCloseHandler object with a closeModal method that closes the modal. If a subscription exists for this event, the modal does not close until the subscriber calls the closeModal method.