fanruan
/
fineui
4
1
Fork 3
Code Issues 1 Pull Requests Releases Wiki Activity
Browse Source

Pull request #2348: 无JIRA任务 bugfix 

Merge in VISUAL/fineui from ~GUY/fineui:master to master

* commit 'b2b6ba3b22b2efc9ded114a66fbb532945e176ae':
  bugfix
es6
guy 3 years ago
parent
b58f3e50d4 b2b6ba3b22
commit
26861e15fd
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      src/base/single/button/buttons/button.js

6
src/base/single/button/buttons/button.js
Unescape View File

@ -61,7 +61,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
type: "bi.icon_label", type: "bi.icon_label",
cls: o.iconCls, cls: o.iconCls,
width: this._const.iconWidth, width: this._const.iconWidth,
height: o.height, height: lineHeight,
lineHeight: lineHeight, lineHeight: lineHeight,
iconWidth: o.iconWidth, iconWidth: o.iconWidth,
iconHeight: o.iconHeight iconHeight: o.iconHeight
@ -71,7 +71,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
text: o.text, text: o.text,
textWidth: BI.isNotNull(o.textWidth) ? o.textWidth - this._const.iconWidth : null, textWidth: BI.isNotNull(o.textWidth) ? o.textWidth - this._const.iconWidth : null,
textHeight: textHeight, textHeight: textHeight,
height: o.height, height: lineHeight,
value: o.value value: o.value
}); });
BI.createWidget({ BI.createWidget({
@ -88,7 +88,7 @@ BI.Button = BI.inherit(BI.BasicButton, {
} else { } else {
this.text = BI.createWidget({ this.text = BI.createWidget({
type: "bi.label", type: "bi.label",
height: o.height, height: lineHeight,
textAlign: o.textAlign, textAlign: o.textAlign,
whiteSpace: o.whiteSpace, whiteSpace: o.whiteSpace,
textWidth: o.textWidth, textWidth: o.textWidth,

Write Preview
Loading…
Cancel
Save