Merge pull request #2856 from ONLYOFFICE/fix/fix-bugs

[common] Fix set icon class function
ONLYOFFICE · Feb 21, 2024 · e72340c · e72340c
2 parents 444c46c + 47edd10
commit e72340c
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
@@ -779,10 +779,11 @@ define([
             if (/svgicon/.test(this.iconCls)) {
                 var icon = /svgicon\s(\S+)/.exec(this.iconCls);
                 svgIcon.attr('xlink:href', icon && icon.length > 1 ? '#' + icon[1] : '');
-            } else if (svgIcon.length) {
-                var icon = /btn-[^\s]+/.exec(this.iconCls);
-                svgIcon.attr('href', icon ? '#' + icon[0]: '');
             } else {
+                if (svgIcon.length) {
+                    var icon = /btn-[^\s]+/.exec(this.iconCls);
+                    svgIcon.attr('href', icon ? '#' + icon[0]: '');
+                }
                 btnIconEl.removeClass(oldCls);
                 btnIconEl.addClass(cls || '');
                 if (this.options.scaling === false) {