diff --git a/apps/common/main/lib/component/Button.js b/apps/common/main/lib/component/Button.js index 9062c41fa6..37ac7cb978 100644 --- 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 = ''.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')) {