Browse Source

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

* commit '15d00c210fb469938ff9268d5b86f7a46b973bbf':
  update
  _setValid
master
windy 8 years ago
parent
commit
836403aa74
  1. 17
      bi/base.js
  2. 11
      bi/case.js
  3. 17
      docs/base.js
  4. 11
      docs/case.js
  5. 5
      src/base/single/editor/editor.js
  6. 8
      src/base/single/editor/editor.textarea.js
  7. 4
      src/base/single/input/input.js
  8. 6
      src/case/editor/editor.search.js
  9. 5
      src/case/editor/editor.sign.js

17
bi/base.js

@ -18216,11 +18216,6 @@ BI.Editor = BI.inherit(BI.Single, {
return BI.trim(this.editor.getValue());
},
setValid: function (b) {
BI.Editor.superclass.setValid.apply(this, arguments);
this.editor.setValid(b);
},
isEditing: function () {
return this.editor.isEditing();
},
@ -18487,10 +18482,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
return this.style;
},
setValid: function (b) {
BI.TextAreaEditor.superclass.setValid.apply(this, arguments);
this.content.setValid(b);
this.watermark && this.watermark.setValid(b);
_setValid: function (b) {
BI.TextAreaEditor.superclass._setValid.apply(this, arguments);
// this.content.setValid(b);
// this.watermark && this.watermark.setValid(b);
}
});
BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE";
@ -19483,8 +19478,8 @@ BI.Input = BI.inherit(BI.Single, {
return this._lastValidValue;
},
setValid: function () {
BI.Input.superclass.setValid.apply(this, arguments);
_setValid: function () {
BI.Input.superclass._setValid.apply(this, arguments);
if (this.isValid()) {
this._lastValidValue = this.getValue();
this.element.removeClass("bi-input-error");

11
bi/case.js

@ -5184,11 +5184,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear.visible();
}
},
setValid: function (b) {
this.editor.setValid(b);
},
isEditing: function () {
return this.editor.isEditing();
},
@ -5867,11 +5863,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
return this.editor.isValid();
},
setValid: function (v) {
BI.SignEditor.superclass.setValid.apply(this, arguments);
this.editor.setValid(v);
},
setErrorText: function (text) {
this.editor.setErrorText(text);
},

17
docs/base.js

@ -18216,11 +18216,6 @@ BI.Editor = BI.inherit(BI.Single, {
return BI.trim(this.editor.getValue());
},
setValid: function (b) {
BI.Editor.superclass.setValid.apply(this, arguments);
this.editor.setValid(b);
},
isEditing: function () {
return this.editor.isEditing();
},
@ -18487,10 +18482,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
return this.style;
},
setValid: function (b) {
BI.TextAreaEditor.superclass.setValid.apply(this, arguments);
this.content.setValid(b);
this.watermark && this.watermark.setValid(b);
_setValid: function (b) {
BI.TextAreaEditor.superclass._setValid.apply(this, arguments);
// this.content.setValid(b);
// this.watermark && this.watermark.setValid(b);
}
});
BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE";
@ -19483,8 +19478,8 @@ BI.Input = BI.inherit(BI.Single, {
return this._lastValidValue;
},
setValid: function () {
BI.Input.superclass.setValid.apply(this, arguments);
_setValid: function () {
BI.Input.superclass._setValid.apply(this, arguments);
if (this.isValid()) {
this._lastValidValue = this.getValue();
this.element.removeClass("bi-input-error");

11
docs/case.js

@ -5184,11 +5184,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear.visible();
}
},
setValid: function (b) {
this.editor.setValid(b);
},
isEditing: function () {
return this.editor.isEditing();
},
@ -5867,11 +5863,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
return this.editor.isValid();
},
setValid: function (v) {
BI.SignEditor.superclass.setValid.apply(this, arguments);
this.editor.setValid(v);
},
setErrorText: function (text) {
this.editor.setErrorText(text);
},

5
src/base/single/editor/editor.js

@ -292,11 +292,6 @@ BI.Editor = BI.inherit(BI.Single, {
return BI.trim(this.editor.getValue());
},
setValid: function (b) {
BI.Editor.superclass.setValid.apply(this, arguments);
this.editor.setValid(b);
},
isEditing: function () {
return this.editor.isEditing();
},

8
src/base/single/editor/editor.textarea.js

@ -149,10 +149,10 @@ BI.TextAreaEditor = BI.inherit(BI.Single, {
return this.style;
},
setValid: function (b) {
BI.TextAreaEditor.superclass.setValid.apply(this, arguments);
this.content.setValid(b);
this.watermark && this.watermark.setValid(b);
_setValid: function (b) {
BI.TextAreaEditor.superclass._setValid.apply(this, arguments);
// this.content.setValid(b);
// this.watermark && this.watermark.setValid(b);
}
});
BI.TextAreaEditor.EVENT_CHANGE = "EVENT_CHANGE";

4
src/base/single/input/input.js

@ -241,8 +241,8 @@ BI.Input = BI.inherit(BI.Single, {
return this._lastValidValue;
},
setValid: function () {
BI.Input.superclass.setValid.apply(this, arguments);
_setValid: function () {
BI.Input.superclass._setValid.apply(this, arguments);
if (this.isValid()) {
this._lastValidValue = this.getValue();
this.element.removeClass("bi-input-error");

6
src/case/editor/editor.search.js

@ -157,11 +157,7 @@ BI.SearchEditor = BI.inherit(BI.Widget, {
this.clear.visible();
}
},
setValid: function (b) {
this.editor.setValid(b);
},
isEditing: function () {
return this.editor.isEditing();
},

5
src/case/editor/editor.sign.js

@ -206,11 +206,6 @@ BI.SignEditor = BI.inherit(BI.Widget, {
return this.editor.isValid();
},
setValid: function (v) {
BI.SignEditor.superclass.setValid.apply(this, arguments);
this.editor.setValid(v);
},
setErrorText: function (text) {
this.editor.setErrorText(text);
},

Loading…
Cancel
Save