Browse Source

Merge branch 'master' of ssh://cloud.finedevelop.com:7999/~windy/fineui

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js
es6
windy 6 years ago
parent
commit
876a4521ec
  1. 6
      dist/bundle.js
  2. 6
      dist/case.js
  3. 6
      dist/fineui.js
  4. 4
      src/case/richeditor/plugins/combo.fontfamily.js
  5. 2
      src/case/richeditor/plugins/combo.sizechooser.js

6
dist/bundle.js vendored

@ -84130,8 +84130,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },
@ -84203,7 +84203,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },

6
dist/case.js vendored

@ -11566,8 +11566,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },
@ -11639,7 +11639,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },

6
dist/fineui.js vendored

@ -84379,8 +84379,8 @@ BI.shortcut("bi.rich_editor_color_chooser", BI.RichEditorColorChooser);BI.RichEd
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },
@ -84452,7 +84452,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },

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

@ -3,8 +3,8 @@ BI.RichEditorFontChooser = BI.inherit(BI.RichEditorAction, {
return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), { return BI.extend(BI.RichEditorFontChooser.superclass._defaultConfig.apply(this, arguments), {
baseCls: "bi-rich-editor-font-chooser bi-border bi-card", baseCls: "bi-rich-editor-font-chooser bi-border bi-card",
command: "FontName", command: "FontName",
width: 50, width: 100,
height: 20 height: 24
}); });
}, },

2
src/case/richeditor/plugins/combo.sizechooser.js

@ -11,7 +11,7 @@ BI.RichEditorSizeChooser = BI.inherit(BI.RichEditorAction, {
baseCls: "bi-rich-editor-size-chooser bi-border bi-card", baseCls: "bi-rich-editor-size-chooser bi-border bi-card",
command: "FontSize", command: "FontSize",
width: 50, width: 50,
height: 20 height: 24
}); });
}, },

Loading…
Cancel
Save