Browse Source

Merge pull request #451 in FUI/fineui from ~WINDY/fui:master to master

* commit '1a9a231d1a2e332b762804ec907527c884ec08f2':
  BI-24044
  update
master
guy 7 years ago
parent
commit
6c3243d28a
  1. 16
      dist/_fineui.min.js
  2. 1
      dist/base.js
  3. 7
      dist/bundle.js
  4. 2
      dist/bundle.min.js
  5. 6
      dist/case.js
  6. 7
      dist/fineui.js
  7. 16
      dist/fineui.min.js
  8. 1
      src/base/single/button/buttons/button.icon.js
  9. 6
      src/case/richeditor/plugins/combo.fontfamily.js

16
dist/_fineui.min.js vendored

File diff suppressed because one or more lines are too long

1
dist/base.js vendored

@ -16574,7 +16574,6 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
items: [this.icon] items: [this.icon]
}); });
} else { } else {
this.element.css("lineHeight", "1px");
BI.createWidget({ BI.createWidget({
element: this, element: this,
type: "bi.center_adapt", type: "bi.center_adapt",

7
dist/bundle.js vendored

@ -52344,7 +52344,6 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
items: [this.icon] items: [this.icon]
}); });
} else { } else {
this.element.css("lineHeight", "1px");
BI.createWidget({ BI.createWidget({
element: this, element: this,
type: "bi.center_adapt", type: "bi.center_adapt",
@ -84003,13 +84002,13 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
el: { el: {
type: "bi.button_group", type: "bi.button_group",
items: BI.createItems([{ items: BI.createItems([{
value: "Microsoft YaHei", value: "MicrosoftYaHei",
text: BI.i18nText("BI-Microsoft_YaHei") text: BI.i18nText("BI-Microsoft_YaHei")
}, { }, {
value: "PingFangSC-Light !important", value: "PingFangSC-Light",
text: BI.i18nText("BI-Apple_Light") text: BI.i18nText("BI-Apple_Light")
}, { }, {
value: "arial", value: "ArialMT",
text: "Arial" text: "Arial"
}, { }, {
value: "Verdana", value: "Verdana",

2
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

6
dist/case.js vendored

@ -11532,13 +11532,13 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
el: { el: {
type: "bi.button_group", type: "bi.button_group",
items: BI.createItems([{ items: BI.createItems([{
value: "Microsoft YaHei", value: "MicrosoftYaHei",
text: BI.i18nText("BI-Microsoft_YaHei") text: BI.i18nText("BI-Microsoft_YaHei")
}, { }, {
value: "PingFangSC-Light !important", value: "PingFangSC-Light",
text: BI.i18nText("BI-Apple_Light") text: BI.i18nText("BI-Apple_Light")
}, { }, {
value: "arial", value: "ArialMT",
text: "Arial" text: "Arial"
}, { }, {
value: "Verdana", value: "Verdana",

7
dist/fineui.js vendored

@ -52587,7 +52587,6 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
items: [this.icon] items: [this.icon]
}); });
} else { } else {
this.element.css("lineHeight", "1px");
BI.createWidget({ BI.createWidget({
element: this, element: this,
type: "bi.center_adapt", type: "bi.center_adapt",
@ -84246,13 +84245,13 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
el: { el: {
type: "bi.button_group", type: "bi.button_group",
items: BI.createItems([{ items: BI.createItems([{
value: "Microsoft YaHei", value: "MicrosoftYaHei",
text: BI.i18nText("BI-Microsoft_YaHei") text: BI.i18nText("BI-Microsoft_YaHei")
}, { }, {
value: "PingFangSC-Light !important", value: "PingFangSC-Light",
text: BI.i18nText("BI-Apple_Light") text: BI.i18nText("BI-Apple_Light")
}, { }, {
value: "arial", value: "ArialMT",
text: "Arial" text: "Arial"
}, { }, {
value: "Verdana", value: "Verdana",

16
dist/fineui.min.js vendored

File diff suppressed because one or more lines are too long

1
src/base/single/button/buttons/button.icon.js

@ -32,7 +32,6 @@ BI.IconButton = BI.inherit(BI.BasicButton, {
items: [this.icon] items: [this.icon]
}); });
} else { } else {
this.element.css("lineHeight", "1px");
BI.createWidget({ BI.createWidget({
element: this, element: this,
type: "bi.center_adapt", type: "bi.center_adapt",

6
src/case/richeditor/plugins/combo.fontfamily.js

@ -29,13 +29,13 @@ BI.RichEditorFontChooser = BI.inherit(BI.RichEditorAction, {
el: { el: {
type: "bi.button_group", type: "bi.button_group",
items: BI.createItems([{ items: BI.createItems([{
value: "Microsoft YaHei", value: "MicrosoftYaHei",
text: BI.i18nText("BI-Microsoft_YaHei") text: BI.i18nText("BI-Microsoft_YaHei")
}, { }, {
value: "PingFangSC-Light !important", value: "PingFangSC-Light",
text: BI.i18nText("BI-Apple_Light") text: BI.i18nText("BI-Apple_Light")
}, { }, {
value: "arial", value: "ArialMT",
text: "Arial" text: "Arial"
}, { }, {
value: "Verdana", value: "Verdana",

Loading…
Cancel
Save