diff --git a/dist/base.js b/dist/base.js index 0be080b54..7d8dbf814 100644 --- a/dist/base.js +++ b/dist/base.js @@ -18407,7 +18407,7 @@ BI.Editor = BI.inherit(BI.Single, { self.fireEvent(BI.Editor.EVENT_FOCUS, arguments); }); this.editor.on(BI.Input.EVENT_BLUR, function () { - self.setErrorVisible(false); + self._setErrorVisible(false); self.element.removeClass("bi-editor-focus"); 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 () { self._checkWaterMark(); - self.setErrorVisible(false); + self._setErrorVisible(false); self.fireEvent(BI.Editor.EVENT_VALID, arguments); }); this.editor.on(BI.Input.EVENT_ERROR, function () { self._checkWaterMark(); self.fireEvent(BI.Editor.EVENT_ERROR, arguments); - self.setErrorVisible(self.isEditing()); + self._setErrorVisible(self.isEditing()); }); this.editor.on(BI.Input.EVENT_RESTRICT, function () { self._checkWaterMark(); - var tip = self.setErrorVisible(true); + var tip = self._setErrorVisible(true); tip && tip.element.fadeOut(100, function () { tip.element.fadeIn(100); }); @@ -18498,7 +18498,7 @@ BI.Editor = BI.inherit(BI.Single, { }, _checkError: function () { - this.setErrorVisible(this.isEnabled() && !this.isValid()); + this._setErrorVisible(this.isEnabled() && !this.isValid()); this._checkToolTip(); }, @@ -18519,7 +18519,7 @@ BI.Editor = BI.inherit(BI.Single, { return this.options.errorText; }, - setErrorVisible: function (b) { + _setErrorVisible: function (b) { var o = this.options; var errorText = o.errorText; if (BI.isFunction(errorText)) { diff --git a/dist/bundle.css b/dist/bundle.css index 73ed85675..2d39c0662 100644 --- a/dist/bundle.css +++ b/dist/bundle.css @@ -503,16 +503,9 @@ textarea { color: #242640; } .bi-z-index-mask { - color: #ffffff; background-color: rgba(26, 26, 26, 0.5); 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 { color: #1a1a1a; diff --git a/dist/bundle.js b/dist/bundle.js index c3ed187d0..294564430 100644 --- a/dist/bundle.js +++ b/dist/bundle.js @@ -54167,7 +54167,7 @@ BI.Editor = BI.inherit(BI.Single, { self.fireEvent(BI.Editor.EVENT_FOCUS, arguments); }); this.editor.on(BI.Input.EVENT_BLUR, function () { - self.setErrorVisible(false); + self._setErrorVisible(false); self.element.removeClass("bi-editor-focus"); 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 () { self._checkWaterMark(); - self.setErrorVisible(false); + self._setErrorVisible(false); self.fireEvent(BI.Editor.EVENT_VALID, arguments); }); this.editor.on(BI.Input.EVENT_ERROR, function () { self._checkWaterMark(); self.fireEvent(BI.Editor.EVENT_ERROR, arguments); - self.setErrorVisible(self.isEditing()); + self._setErrorVisible(self.isEditing()); }); this.editor.on(BI.Input.EVENT_RESTRICT, function () { self._checkWaterMark(); - var tip = self.setErrorVisible(true); + var tip = self._setErrorVisible(true); tip && tip.element.fadeOut(100, function () { tip.element.fadeIn(100); }); @@ -54258,7 +54258,7 @@ BI.Editor = BI.inherit(BI.Single, { }, _checkError: function () { - this.setErrorVisible(this.isEnabled() && !this.isValid()); + this._setErrorVisible(this.isEnabled() && !this.isValid()); this._checkToolTip(); }, @@ -54279,7 +54279,7 @@ BI.Editor = BI.inherit(BI.Single, { return this.options.errorText; }, - setErrorVisible: function (b) { + _setErrorVisible: function (b) { var o = this.options; var errorText = o.errorText; if (BI.isFunction(errorText)) { diff --git a/dist/core.css b/dist/core.css index 4bfee0e30..d4f0e7789 100644 --- a/dist/core.css +++ b/dist/core.css @@ -503,16 +503,9 @@ textarea { color: #242640; } .bi-z-index-mask { - color: #ffffff; background-color: rgba(26, 26, 26, 0.5); 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 { color: #1a1a1a; diff --git a/dist/core_without_normalize.css b/dist/core_without_normalize.css index 0c2c5b488..efb3275e5 100644 --- a/dist/core_without_normalize.css +++ b/dist/core_without_normalize.css @@ -225,16 +225,9 @@ textarea { color: #242640; } .bi-z-index-mask { - color: #ffffff; background-color: rgba(26, 26, 26, 0.5); 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 { color: #1a1a1a; diff --git a/dist/fineui.css b/dist/fineui.css index 803e44c43..3a41962a7 100644 --- a/dist/fineui.css +++ b/dist/fineui.css @@ -503,16 +503,9 @@ textarea { color: #242640; } .bi-z-index-mask { - color: #ffffff; background-color: rgba(26, 26, 26, 0.5); 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 { color: #1a1a1a; diff --git a/src/base/single/editor/editor.js b/src/base/single/editor/editor.js index 15a4e9c0a..a2ac09fd1 100644 --- a/src/base/single/editor/editor.js +++ b/src/base/single/editor/editor.js @@ -107,7 +107,7 @@ BI.Editor = BI.inherit(BI.Single, { self.fireEvent(BI.Editor.EVENT_FOCUS, arguments); }); this.editor.on(BI.Input.EVENT_BLUR, function () { - self.setErrorVisible(false); + self._setErrorVisible(false); self.element.removeClass("bi-editor-focus"); 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 () { self._checkWaterMark(); - self.setErrorVisible(false); + self._setErrorVisible(false); self.fireEvent(BI.Editor.EVENT_VALID, arguments); }); this.editor.on(BI.Input.EVENT_ERROR, function () { self._checkWaterMark(); self.fireEvent(BI.Editor.EVENT_ERROR, arguments); - self.setErrorVisible(self.isEditing()); + self._setErrorVisible(self.isEditing()); }); this.editor.on(BI.Input.EVENT_RESTRICT, function () { self._checkWaterMark(); - var tip = self.setErrorVisible(true); + var tip = self._setErrorVisible(true); tip && tip.element.fadeOut(100, function () { tip.element.fadeIn(100); }); @@ -198,7 +198,7 @@ BI.Editor = BI.inherit(BI.Single, { }, _checkError: function () { - this.setErrorVisible(this.isEnabled() && !this.isValid()); + this._setErrorVisible(this.isEnabled() && !this.isValid()); this._checkToolTip(); }, @@ -219,7 +219,7 @@ BI.Editor = BI.inherit(BI.Single, { return this.options.errorText; }, - setErrorVisible: function (b) { + _setErrorVisible: function (b) { var o = this.options; var errorText = o.errorText; if (BI.isFunction(errorText)) { diff --git a/src/css/core/utils/common.css b/src/css/core/utils/common.css index 46d70fc4d..368d31dbd 100644 --- a/src/css/core/utils/common.css +++ b/src/css/core/utils/common.css @@ -225,16 +225,9 @@ textarea { color: #242640; } .bi-z-index-mask { - color: #ffffff; background-color: rgba(26, 26, 26, 0.5); 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 { color: #1a1a1a; diff --git a/src/less/core/utils/common.less b/src/less/core/utils/common.less index d57fca715..4a2d6b2e4 100644 --- a/src/less/core/utils/common.less +++ b/src/less/core/utils/common.less @@ -282,13 +282,13 @@ textarea { } .bi-z-index-mask { - color: @color-bi-background-default; - & .bi-input { - color: @color-bi-background-default; - } - & .bi-textarea { - color: @color-bi-background-default; - } + //color: @color-bi-background-default; + //& .bi-input { + // color: @color-bi-background-default; + //} + //& .bi-textarea { + // color: @color-bi-background-default; + //} .background-color(@color-bi-background-black, 50%); }