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

[common] Fix bug 67538
ONLYOFFICE · May 8, 2024 · cd0b376 · cd0b376
2 parents 901b416 + 84a9e74
commit cd0b376
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js
@@ -960,14 +960,14 @@ define([
                 me.options.scaling = ratio;
 
                 if (ratio > 2) {
-                    if (!me.$el.find('svg.icon').length) {
-                        const iconCls = me.iconCls || me.$el.find('i.icon').attr('class');
+                    const $el = me.$el.is('button') ? me.$el : me.$el.find('button:first');
+                    if (!$el.find('svg.icon').length) {
+                        const iconCls = me.iconCls || $el.find('i.icon').attr('class');
                         const re_icon_name = /btn-[^\s]+/.exec(iconCls);
                         const icon_name = re_icon_name ? re_icon_name[0] : "null";
                         const rtlCls = (iconCls ? iconCls.indexOf('icon-rtl') : -1) > -1 ? 'icon-rtl' : '';
                         const svg_icon = '<svg class="icon %rtlCls"><use class="zoom-int" href="#%iconname"></use></svg>'.replace('%iconname', icon_name).replace('%rtlCls', rtlCls);
-
-                        me.$el.find('i.icon').after(svg_icon);
+                        $el.find('i.icon').after(svg_icon);
                     }
                 } else {
                     if (!me.$el.find('i.icon')) {