From 2005a9f1bb00bcc3eba69afc039748e4cbad5656 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 4 Jan 2022 15:31:29 -0800 Subject: [PATCH 1/6] Update index.hbs --- addons/rose/addon/components/rose/form/helper-text/index.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/components/rose/form/helper-text/index.hbs b/addons/rose/addon/components/rose/form/helper-text/index.hbs index 92e716a2b..4dadb4d55 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.hbs +++ b/addons/rose/addon/components/rose/form/helper-text/index.hbs @@ -4,5 +4,5 @@ ...attributes > {{yield}} -{{@linkTxt}} +{{@linkText}} From 174b6246c767161ba4415f314e4af2dba43e4363 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 4 Jan 2022 15:31:47 -0800 Subject: [PATCH 2/6] Update index.stories.mdx --- .../components/rose/form/helper-text/index.stories.mdx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx index 48a2070bb..a41cc98b6 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx @@ -11,7 +11,7 @@ Displays helpful messages related to a form field. This component is used by form fields and should not be used directly. ```html - + Helper text ``` @@ -19,14 +19,14 @@ by form fields and should not be used directly. {{ template: hbs` - + Helper text `, context: { error: boolean('error', false), link: text('link', 'http://www.example.net/'), - linkTxt: text('linkTxt', 'link text') + linkText: text('linkText', 'link text') }, }} From 7cd59dcf37a2d2f57f18709d2376402397c757e7 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Tue, 4 Jan 2022 15:32:12 -0800 Subject: [PATCH 3/6] Update index.stories.mdx --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx index a41cc98b6..19d8e4fac 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx @@ -19,7 +19,7 @@ by form fields and should not be used directly. {{ template: hbs` - + Helper text `, From f5f091613556cc61df1283a39021e20680e04691 Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Wed, 5 Jan 2022 11:36:41 -0800 Subject: [PATCH 4/6] Update index.stories.mdx --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx index 19d8e4fac..05e7f2bc0 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx @@ -11,7 +11,7 @@ Displays helpful messages related to a form field. This component is used by form fields and should not be used directly. ```html - + Helper text ``` From a0a75e1e42a2aa74b691bf384082505c8d1cbb7f Mon Sep 17 00:00:00 2001 From: Dharini Jeeva Date: Wed, 5 Jan 2022 11:44:58 -0800 Subject: [PATCH 5/6] Update index.stories.mdx --- .../addon/components/rose/form/helper-text/index.stories.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx index 05e7f2bc0..bddd52683 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx +++ b/addons/rose/addon/components/rose/form/helper-text/index.stories.mdx @@ -26,7 +26,7 @@ by form fields and should not be used directly. context: { error: boolean('error', false), link: text('link', 'http://www.example.net/'), - linkText: text('linkText', 'link text') + linkText: text('linkText', 'sample link text') }, }} From 22700688b65b75cbc71ef49909d48242023025a6 Mon Sep 17 00:00:00 2001 From: dharini Date: Thu, 6 Jan 2022 10:42:06 -0800 Subject: [PATCH 6/6] =?UTF-8?q?feat:=20=F0=9F=8E=B8=20show=20a=20tag=20onl?= =?UTF-8?q?y=20if=20href=20and=20link=20are=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rose/addon/components/rose/form/helper-text/index.hbs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/addons/rose/addon/components/rose/form/helper-text/index.hbs b/addons/rose/addon/components/rose/form/helper-text/index.hbs index 4dadb4d55..7b803ae83 100644 --- a/addons/rose/addon/components/rose/form/helper-text/index.hbs +++ b/addons/rose/addon/components/rose/form/helper-text/index.hbs @@ -4,5 +4,9 @@ ...attributes > {{yield}} -{{@linkText}} + {{#if @link}} + {{#if @linkText}} + {{@linkText}} + {{/if}} + {{/if}}