git.ithinksw.org
/
extjs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upgrade to ExtJS 3.2.2 - Released 06/02/2010
[extjs.git]
/
src
/
widgets
/
form
/
TextField.js
diff --git
a/src/widgets/form/TextField.js
b/src/widgets/form/TextField.js
index
27627b3
..
38ba5ec
100644
(file)
--- a/
src/widgets/form/TextField.js
+++ b/
src/widgets/form/TextField.js
@@
-1,5
+1,5
@@
/*!
/*!
- * Ext JS Library 3.2.
0
+ * Ext JS Library 3.2.
2
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
* Copyright(c) 2006-2010 Ext JS, Inc.
* licensing@extjs.com
* http://www.extjs.com/license
@@
-440,13
+440,22
@@
var myField = new Ext.form.NumberField({
value = value || this.processValue(this.getRawValue());
value = value || this.processValue(this.getRawValue());
- if
(Ext.isFunction(this.validator))
{
+ if
(Ext.isFunction(this.validator))
{
var msg = this.validator(value);
if (msg !== true) {
errors.push(msg);
}
}
var msg = this.validator(value);
if (msg !== true) {
errors.push(msg);
}
}
+ if (value.length < 1 || value === this.emptyText) {
+ if (this.allowBlank) {
+ //if value is blank and allowBlank is true, there cannot be any additional errors
+ return errors;
+ } else {
+ errors.push(this.blankText);
+ }
+ }
+
if (!this.allowBlank && (value.length < 1 || value === this.emptyText)) { // if it's blank
errors.push(this.blankText);
}
if (!this.allowBlank && (value.length < 1 || value === this.emptyText)) { // if it's blank
errors.push(this.blankText);
}