Merge pull request #11027 from artfulrobot/master

[civicrm-core.git] / js / jquery / jquery.crmIconPicker.js

diff --git a/js/jquery/jquery.crmIconPicker.js b/js/jquery/jquery.crmIconPicker.js
index 8fce94267fc2500c39f70309d862e10bb4ef6217..6e84df5c026ed09da2f65caab8e68feeaa0f89e9 100644 (file)
--- a/js/jquery/jquery.crmIconPicker.js
+++ b/js/jquery/jquery.crmIconPicker.js
@@ -38,10 +38,12 @@
         ];
 
       function formatButton() {
-        var split = $input.val().split(' ');
+        var val = $input.val().replace('fa ', '');
+        val = val.replace('crm-i ', '');
+        var split = val.split(' ');
         $button.button('option', {
           label: split[0] || ts('None'),
-          icons: {primary: $input.val()}
+          icons: {primary: val ? val : 'fa-'}
         });
         $style.toggle(!!split[0]).val(split[1] || '');
       }