Merge pull request #24073 from kurund/formbuilder-icon-fixes

Afform - show icon on button only if icon is selected
civicrm · Jul 28, 2022 · b3e9cdd · b3e9cdd
2 parents 1e7f222 + 974cbc7
commit b3e9cdd
Showing 1 changed file with 8 additions and 5 deletions.
diff --git a/ang/crmUi.js b/ang/crmUi.js
@@ -952,12 +952,15 @@
             // handled in crmUiTab ctrl
             return;
           }
-          if (attrs.crmIcon.substring(0,3) == 'fa-') {
-            $(element).prepend('<i class="crm-i ' + attrs.crmIcon + '" aria-hidden="true"></i> ');
-          }
-          else {
-            $(element).prepend('<span class="icon ui-icon-' + attrs.crmIcon + '"></span> ');
+          if (attrs.crmIcon) {
+            if (attrs.crmIcon.substring(0,3) == 'fa-') {
+              $(element).prepend('<i class="crm-i ' + attrs.crmIcon + '" aria-hidden="true"></i> ');
+            }
+            else {
+              $(element).prepend('<span class="icon ui-icon-' + attrs.crmIcon + '"></span> ');
+            }
           }
+
           // Add crm-* class to non-bootstrap buttons
           if ($(element).is('button:not(.btn)')) {
             $(element).addClass('crm-button');