Browse Source

Merge pull request #182 in ~GUY/fineui from ~WINDY/fineui:master to master

* commit 'bba739fadc59a058df3cf81654c3fc3b07ef4285':
  codeeditor样式
es6
windy 7 years ago
parent
commit
139bed035d
  1. 4
      bi/base.js
  2. 4
      dist/base.js
  3. 4
      dist/bundle.js
  4. 52
      dist/bundle.min.js
  5. 4
      src/base/single/editor/editor.code.js

4
bi/base.js

@ -19191,6 +19191,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
setStyle: function (style) {
this.style = style;
this.element.css(style);
var wrapperStyle = this.editor.getWrapperElement().style;
BI.extend(wrapperStyle, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
});
},
getStyle: function () {

4
dist/base.js vendored

@ -19191,6 +19191,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
setStyle: function (style) {
this.style = style;
this.element.css(style);
var wrapperStyle = this.editor.getWrapperElement().style;
BI.extend(wrapperStyle, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
});
},
getStyle: function () {

4
dist/bundle.js vendored

@ -48218,6 +48218,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
setStyle: function (style) {
this.style = style;
this.element.css(style);
var wrapperStyle = this.editor.getWrapperElement().style;
BI.extend(wrapperStyle, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
});
},
getStyle: function () {

52
dist/bundle.min.js vendored

File diff suppressed because one or more lines are too long

4
src/base/single/editor/editor.code.js

@ -181,6 +181,10 @@ BI.CodeEditor = BI.inherit(BI.Single, {
setStyle: function (style) {
this.style = style;
this.element.css(style);
var wrapperStyle = this.editor.getWrapperElement().style;
BI.extend(wrapperStyle, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
});
},
getStyle: function () {

Loading…
Cancel
Save