Frank
/
fineui
forked from fanruan/fineui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge branch 'master' of http://www.finedevelop.com:2015/scm/~guy/fineui

es6
iapyang 7 years ago
parent
69cada5c73 3b9ec43f7a
commit
9b4977c53f
8 changed files with 42 additions and 34 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. 4
      bi/base.js
  2. 2
      bi/core.js
  3. 4
      dist/base.js
  4. 6
      dist/bundle.js
  5. 52
      dist/bundle.min.js
  6. 2
      dist/core.js
  7. 4
      src/base/single/editor/editor.textarea.js
  8. 2
      src/data/pool/pool.sharing.js

4
bi/base.js
Unescape View File

@ -18465,7 +18465,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
setStyle: function (style) { setStyle: function (style) {
this.style = style; this.style = style;
this.element.css(style); this.element.css(style);
this.content.element.css(style) this.content.element.css(BI.extend({}, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
}))
}, },
getStyle: function () { getStyle: function () {

2
bi/core.js
Unescape View File

@ -17474,7 +17474,7 @@ Data.Constant = BI.Constant = BICst = {};
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
copy = _Shared; copy = _Shared;
for (var i = 0; i < args.length; i++) { for (var i = 0; i < args.length; i++) {
copy = copy[args[i]]; copy = copy && copy[args[i]];
} }
return copy; return copy;
}, },

4
dist/base.js vendored
Unescape View File

@ -18465,7 +18465,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
setStyle: function (style) { setStyle: function (style) {
this.style = style; this.style = style;
this.element.css(style); this.element.css(style);
this.content.element.css(style) this.content.element.css(BI.extend({}, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
}))
}, },
getStyle: function () { getStyle: function () {

6
dist/bundle.js vendored
Unescape View File

@ -28616,7 +28616,7 @@ Data.Constant = BI.Constant = BICst = {};
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
copy = _Shared; copy = _Shared;
for (var i = 0; i < args.length; i++) { for (var i = 0; i < args.length; i++) {
copy = copy[args[i]]; copy = copy && copy[args[i]];
} }
return copy; return copy;
}, },
@ -47194,7 +47194,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
setStyle: function (style) { setStyle: function (style) {
this.style = style; this.style = style;
this.element.css(style); this.element.css(style);
this.content.element.css(style) this.content.element.css(BI.extend({}, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
}))
}, },
getStyle: function () { getStyle: function () {

52
dist/bundle.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
dist/core.js vendored
Unescape View File

@ -28616,7 +28616,7 @@ Data.Constant = BI.Constant = BICst = {};
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
copy = _Shared; copy = _Shared;
for (var i = 0; i < args.length; i++) { for (var i = 0; i < args.length; i++) {
copy = copy[args[i]]; copy = copy && copy[args[i]];
} }
return copy; return copy;
}, },

4
src/base/single/editor/editor.textarea.js
Unescape View File

@ -142,7 +142,9 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
setStyle: function (style) { setStyle: function (style) {
this.style = style; this.style = style;
this.element.css(style); this.element.css(style);
this.content.element.css(style) this.content.element.css(BI.extend({}, style, {
color: style.color || BI.DOM.getContrastColor(BI.DOM.isRGBColor(style.backgroundColor) ? BI.DOM.rgb2hex(style.backgroundColor) : style.backgroundColor)
}))
}, },
getStyle: function () { getStyle: function () {

2
src/data/pool/pool.sharing.js
Unescape View File

@ -15,7 +15,7 @@
var args = Array.prototype.slice.call(arguments, 0), var args = Array.prototype.slice.call(arguments, 0),
copy = _Shared; copy = _Shared;
for (var i = 0; i < args.length; i++) { for (var i = 0; i < args.length; i++) {
copy = copy[args[i]]; copy = copy && copy[args[i]];
} }
return copy; return copy;
}, },

Write Preview
Loading…
Cancel
Save