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

Merge branch 'master' of http://cloud.finedevelop.com:2015/scm/fui/fineui 

# Conflicts:
#	dist/_fineui.min.js
#	dist/bundle.min.js
#	dist/fineui.min.js
es6
windy 7 years ago
parent
adcfd0eb4b 8d6e7b1a6f
commit
1523ac9dc5
9 changed files with 25 additions and 60 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. 12
      dist/base.js
  2. 7
      dist/bundle.css
  3. 12
      dist/bundle.js
  4. 7
      dist/core.css
  5. 7
      dist/core_without_normalize.css
  6. 7
      dist/fineui.css
  7. 12
      src/base/single/editor/editor.js
  8. 7
      src/css/core/utils/common.css
  9. 14
      src/less/core/utils/common.less

12
dist/base.js vendored
Unescape View File

@ -18407,7 +18407,7 @@ BI.Editor = BI.inherit(BI.Single, {
self.fireEvent(BI.Editor.EVENT_FOCUS, arguments); self.fireEvent(BI.Editor.EVENT_FOCUS, arguments);
}); });
this.editor.on(BI.Input.EVENT_BLUR, function () { this.editor.on(BI.Input.EVENT_BLUR, function () {
self.setErrorVisible(false); self._setErrorVisible(false);
self.element.removeClass("bi-editor-focus"); self.element.removeClass("bi-editor-focus");
self.fireEvent(BI.Editor.EVENT_BLUR, arguments); self.fireEvent(BI.Editor.EVENT_BLUR, arguments);
}); });
@ -18426,17 +18426,17 @@ BI.Editor = BI.inherit(BI.Single, {
this.editor.on(BI.Input.EVENT_VALID, function () { this.editor.on(BI.Input.EVENT_VALID, function () {
self._checkWaterMark(); self._checkWaterMark();
self.setErrorVisible(false); self._setErrorVisible(false);
self.fireEvent(BI.Editor.EVENT_VALID, arguments); self.fireEvent(BI.Editor.EVENT_VALID, arguments);
}); });
this.editor.on(BI.Input.EVENT_ERROR, function () { this.editor.on(BI.Input.EVENT_ERROR, function () {
self._checkWaterMark(); self._checkWaterMark();
self.fireEvent(BI.Editor.EVENT_ERROR, arguments); self.fireEvent(BI.Editor.EVENT_ERROR, arguments);
self.setErrorVisible(self.isEditing()); self._setErrorVisible(self.isEditing());
}); });
this.editor.on(BI.Input.EVENT_RESTRICT, function () { this.editor.on(BI.Input.EVENT_RESTRICT, function () {
self._checkWaterMark(); self._checkWaterMark();
var tip = self.setErrorVisible(true); var tip = self._setErrorVisible(true);
tip && tip.element.fadeOut(100, function () { tip && tip.element.fadeOut(100, function () {
tip.element.fadeIn(100); tip.element.fadeIn(100);
}); });
@ -18498,7 +18498,7 @@ BI.Editor = BI.inherit(BI.Single, {
}, },
_checkError: function () { _checkError: function () {
this.setErrorVisible(this.isEnabled() && !this.isValid()); this._setErrorVisible(this.isEnabled() && !this.isValid());
this._checkToolTip(); this._checkToolTip();
}, },
@ -18519,7 +18519,7 @@ BI.Editor = BI.inherit(BI.Single, {
return this.options.errorText; return this.options.errorText;
}, },
setErrorVisible: function (b) { _setErrorVisible: function (b) {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {

7
dist/bundle.css vendored
Unescape View File

@ -503,16 +503,9 @@ textarea {
color: #242640; color: #242640;
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
} }
.bi-z-index-mask .bi-input {
color: #ffffff;
}
.bi-z-index-mask .bi-textarea {
color: #ffffff;
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #1a1a1a; color: #1a1a1a;

12
dist/bundle.js vendored
Unescape View File

@ -54167,7 +54167,7 @@ BI.Editor = BI.inherit(BI.Single, {
self.fireEvent(BI.Editor.EVENT_FOCUS, arguments); self.fireEvent(BI.Editor.EVENT_FOCUS, arguments);
}); });
this.editor.on(BI.Input.EVENT_BLUR, function () { this.editor.on(BI.Input.EVENT_BLUR, function () {
self.setErrorVisible(false); self._setErrorVisible(false);
self.element.removeClass("bi-editor-focus"); self.element.removeClass("bi-editor-focus");
self.fireEvent(BI.Editor.EVENT_BLUR, arguments); self.fireEvent(BI.Editor.EVENT_BLUR, arguments);
}); });
@ -54186,17 +54186,17 @@ BI.Editor = BI.inherit(BI.Single, {
this.editor.on(BI.Input.EVENT_VALID, function () { this.editor.on(BI.Input.EVENT_VALID, function () {
self._checkWaterMark(); self._checkWaterMark();
self.setErrorVisible(false); self._setErrorVisible(false);
self.fireEvent(BI.Editor.EVENT_VALID, arguments); self.fireEvent(BI.Editor.EVENT_VALID, arguments);
}); });
this.editor.on(BI.Input.EVENT_ERROR, function () { this.editor.on(BI.Input.EVENT_ERROR, function () {
self._checkWaterMark(); self._checkWaterMark();
self.fireEvent(BI.Editor.EVENT_ERROR, arguments); self.fireEvent(BI.Editor.EVENT_ERROR, arguments);
self.setErrorVisible(self.isEditing()); self._setErrorVisible(self.isEditing());
}); });
this.editor.on(BI.Input.EVENT_RESTRICT, function () { this.editor.on(BI.Input.EVENT_RESTRICT, function () {
self._checkWaterMark(); self._checkWaterMark();
var tip = self.setErrorVisible(true); var tip = self._setErrorVisible(true);
tip && tip.element.fadeOut(100, function () { tip && tip.element.fadeOut(100, function () {
tip.element.fadeIn(100); tip.element.fadeIn(100);
}); });
@ -54258,7 +54258,7 @@ BI.Editor = BI.inherit(BI.Single, {
}, },
_checkError: function () { _checkError: function () {
this.setErrorVisible(this.isEnabled() && !this.isValid()); this._setErrorVisible(this.isEnabled() && !this.isValid());
this._checkToolTip(); this._checkToolTip();
}, },
@ -54279,7 +54279,7 @@ BI.Editor = BI.inherit(BI.Single, {
return this.options.errorText; return this.options.errorText;
}, },
setErrorVisible: function (b) { _setErrorVisible: function (b) {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {

7
dist/core.css vendored
Unescape View File

@ -503,16 +503,9 @@ textarea {
color: #242640; color: #242640;
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
} }
.bi-z-index-mask .bi-input {
color: #ffffff;
}
.bi-z-index-mask .bi-textarea {
color: #ffffff;
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #1a1a1a; color: #1a1a1a;

7
dist/core_without_normalize.css vendored
Unescape View File

@ -225,16 +225,9 @@ textarea {
color: #242640; color: #242640;
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
} }
.bi-z-index-mask .bi-input {
color: #ffffff;
}
.bi-z-index-mask .bi-textarea {
color: #ffffff;
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #1a1a1a; color: #1a1a1a;

7
dist/fineui.css vendored
Unescape View File

@ -503,16 +503,9 @@ textarea {
color: #242640; color: #242640;
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
} }
.bi-z-index-mask .bi-input {
color: #ffffff;
}
.bi-z-index-mask .bi-textarea {
color: #ffffff;
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #1a1a1a; color: #1a1a1a;

12
src/base/single/editor/editor.js
Unescape View File

@ -107,7 +107,7 @@ BI.Editor = BI.inherit(BI.Single, {
self.fireEvent(BI.Editor.EVENT_FOCUS, arguments); self.fireEvent(BI.Editor.EVENT_FOCUS, arguments);
}); });
this.editor.on(BI.Input.EVENT_BLUR, function () { this.editor.on(BI.Input.EVENT_BLUR, function () {
self.setErrorVisible(false); self._setErrorVisible(false);
self.element.removeClass("bi-editor-focus"); self.element.removeClass("bi-editor-focus");
self.fireEvent(BI.Editor.EVENT_BLUR, arguments); self.fireEvent(BI.Editor.EVENT_BLUR, arguments);
}); });
@ -126,17 +126,17 @@ BI.Editor = BI.inherit(BI.Single, {
this.editor.on(BI.Input.EVENT_VALID, function () { this.editor.on(BI.Input.EVENT_VALID, function () {
self._checkWaterMark(); self._checkWaterMark();
self.setErrorVisible(false); self._setErrorVisible(false);
self.fireEvent(BI.Editor.EVENT_VALID, arguments); self.fireEvent(BI.Editor.EVENT_VALID, arguments);
}); });
this.editor.on(BI.Input.EVENT_ERROR, function () { this.editor.on(BI.Input.EVENT_ERROR, function () {
self._checkWaterMark(); self._checkWaterMark();
self.fireEvent(BI.Editor.EVENT_ERROR, arguments); self.fireEvent(BI.Editor.EVENT_ERROR, arguments);
self.setErrorVisible(self.isEditing()); self._setErrorVisible(self.isEditing());
}); });
this.editor.on(BI.Input.EVENT_RESTRICT, function () { this.editor.on(BI.Input.EVENT_RESTRICT, function () {
self._checkWaterMark(); self._checkWaterMark();
var tip = self.setErrorVisible(true); var tip = self._setErrorVisible(true);
tip && tip.element.fadeOut(100, function () { tip && tip.element.fadeOut(100, function () {
tip.element.fadeIn(100); tip.element.fadeIn(100);
}); });
@ -198,7 +198,7 @@ BI.Editor = BI.inherit(BI.Single, {
}, },
_checkError: function () { _checkError: function () {
this.setErrorVisible(this.isEnabled() && !this.isValid()); this._setErrorVisible(this.isEnabled() && !this.isValid());
this._checkToolTip(); this._checkToolTip();
}, },
@ -219,7 +219,7 @@ BI.Editor = BI.inherit(BI.Single, {
return this.options.errorText; return this.options.errorText;
}, },
setErrorVisible: function (b) { _setErrorVisible: function (b) {
var o = this.options; var o = this.options;
var errorText = o.errorText; var errorText = o.errorText;
if (BI.isFunction(errorText)) { if (BI.isFunction(errorText)) {

7
src/css/core/utils/common.css
Unescape View File

@ -225,16 +225,9 @@ textarea {
color: #242640; color: #242640;
} }
.bi-z-index-mask { .bi-z-index-mask {
color: #ffffff;
background-color: rgba(26, 26, 26, 0.5); background-color: rgba(26, 26, 26, 0.5);
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a); filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#801a1a1a,endColorstr=#801a1a1a);
} }
.bi-z-index-mask .bi-input {
color: #ffffff;
}
.bi-z-index-mask .bi-textarea {
color: #ffffff;
}
.bi-list-item:hover, .bi-list-item:hover,
.bi-list-item.hover { .bi-list-item.hover {
color: #1a1a1a; color: #1a1a1a;

14
src/less/core/utils/common.less
Unescape View File

@ -282,13 +282,13 @@ textarea {
} }
.bi-z-index-mask { .bi-z-index-mask {
color: @color-bi-background-default; //color: @color-bi-background-default;
& .bi-input { //& .bi-input {
color: @color-bi-background-default; // color: @color-bi-background-default;
} //}
& .bi-textarea { //& .bi-textarea {
color: @color-bi-background-default; // color: @color-bi-background-default;
} //}
.background-color(@color-bi-background-black, 50%); .background-color(@color-bi-background-black, 50%);
} }

Write Preview
Loading…
Cancel
Save