Altered hasBlock in favor for has-block helper (#1468)

Co-authored-by: Brian Gantzler <brian.gantzler@cardinalhealth.com>
ember-bootstrap · Apr 3, 2021 · 6c627d8 · 6c627d8
1 parent 6aeead2
commit 6c627d8
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 14 deletions.
diff --git a/addon/components/bs-form/element.hbs b/addon/components/bs-form/element.hbs
@@ -115,7 +115,7 @@
         size=@size
     ) as |Control|}}
     {{!-- template-lint-enable no-args-paths --}}
-      {{#if hasBlock}}
+      {{#if (has-block)}}
         {{yield
           (hash
             value=this.value

diff --git a/addon/components/bs-form/element/control/radio.hbs b/addon/components/bs-form/element/control/radio.hbs
@@ -21,7 +21,7 @@
             title={{@title}}
             ...attributes
           >
-          {{#if hasBlock}}
+          {{#if (has-block)}}
             {{yield option index}}
           {{else}}
             {{#if @optionLabelPath}}
@@ -51,7 +51,7 @@
               title={{@title}}
               ...attributes
             >
-            {{#if hasBlock}}
+            {{#if (has-block)}}
               {{yield option index}}
             {{else}}
               {{#if @optionLabelPath}}
@@ -84,7 +84,7 @@
           for={{id}}
           class="form-check-label"
         >
-          {{#if hasBlock}}
+          {{#if (has-block)}}
             {{yield option index}}
           {{else}}
             {{#if @optionLabelPath}}

diff --git a/addon/components/bs-form/element/label.hbs b/addon/components/bs-form/element/label.hbs
@@ -1,5 +1,5 @@
 {{#if (macroCondition (macroGetOwnConfig "isBS3"))}}
-  {{#if hasBlock}}
+  {{#if (has-block)}}
     <label>
       {{yield}}
       {{@label}}
@@ -9,7 +9,7 @@
   {{/if}}
 {{else}}
   <label class="{{if this.invisibleLabel "sr-only"}} {{this.labelClass}} {{if this.isHorizontalAndNotCheckbox "col-form-label"}} {{if this.isCheckbox "form-check-label"}} {{this.sizeClass}}" for={{@formElementId}}>
-    {{#if hasBlock}}
+    {{#if (has-block)}}
       {{yield}}
     {{/if}}
     {{@label}}

diff --git a/addon/components/bs-form/element/legend.hbs b/addon/components/bs-form/element/legend.hbs
@@ -1,5 +1,5 @@
 <legend class="{{if this.invisibleLabel "sr-only"}} {{this.labelClass}} {{if this.isHorizontalAndNotCheckbox "col-form-label"}} {{this.sizeClass}}">
-  {{#if hasBlock}}
+  {{#if (has-block)}}
     {{yield}}
   {{/if}}
   {{@label}}

diff --git a/addon/components/bs-modal/footer.hbs b/addon/components/bs-modal/footer.hbs
@@ -1,5 +1,5 @@
 <form class="modal-footer" ...attributes {{on "submit" (bs-default @onSubmit (bs-noop))}}>
-  {{#if hasBlock}}
+  {{#if (has-block)}}
     {{yield}}
   {{else}}
     {{#if @submitTitle}}

diff --git a/addon/components/bs-modal/header.hbs b/addon/components/bs-modal/header.hbs
@@ -8,7 +8,7 @@
     }}
   {{else}}
     {{#if (macroCondition (macroGetOwnConfig "isBS4"))}}
-      {{#if hasBlock}}
+      {{#if (has-block)}}
         {{yield}}
       {{else}}
         {{#component (bs-default @titleComponent (component "bs-modal/header/title"))}}{{@title}}{{/component}}
@@ -21,7 +21,7 @@
       {{#if (bs-default @closeButton true)}}
         {{component (bs-default @closeComponent (component "bs-modal/header/close")) onClick=@onClose}}
       {{/if}}
-      {{#if hasBlock}}
+      {{#if (has-block)}}
         {{yield}}
       {{else}}
         {{#component (bs-default @titleComponent (component "bs-modal/header/title"))}}{{@title}}{{/component}}

diff --git a/addon/components/bs-navbar/toggle.hbs b/addon/components/bs-navbar/toggle.hbs
@@ -1,5 +1,5 @@
 <button type="button" class="{{if (macroCondition (macroGetOwnConfig "isBS4")) "navbar-toggler" "navbar-toggle"}} {{if this.collapsed "collapsed"}}" ...attributes {{on "click" this.handleClick}}>
-  {{#if hasBlock}}
+  {{#if (has-block)}}
     {{yield}}
   {{else}}
     {{#if (macroCondition (macroGetOwnConfig "isBS4"))}}

diff --git a/addon/components/bs-progress/bar.hbs b/addon/components/bs-progress/bar.hbs
@@ -8,13 +8,13 @@
   {{style width=this.percentStyleValue}}
 >
   {{#if this.showLabel}}
-    {{#if hasBlock}}
+    {{#if (has-block)}}
       {{yield this.percentRounded}}
     {{else}}
       {{this.percentRounded}}%
     {{/if}}
   {{else}}
-    {{#if hasBlock}}
+    {{#if (has-block)}}
       <span class="sr-only">{{yield this.percentRounded}}</span>
     {{else}}
       <span class="sr-only">{{this.percentRounded}}%</span>

diff --git a/addon/components/bs-tooltip.hbs b/addon/components/bs-tooltip.hbs
@@ -16,7 +16,7 @@
       @class={{@class}}
       ...attributes
     >
-      {{#if hasBlock}}
+      {{#if (has-block)}}
         {{yield
           (hash
             close=this.close