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.3.1 - Released 11/30/2010
[extjs.git]
/
docs
/
source
/
Combo.html
diff --git
a/docs/source/Combo.html
b/docs/source/Combo.html
index
61c09c3
..
8288c93
100644
(file)
--- a/
docs/source/Combo.html
+++ b/
docs/source/Combo.html
@@
-7,10
+7,10
@@
</head>
<body onload="prettyPrint();">
<pre class="prettyprint lang-js">/*!
</head>
<body onload="prettyPrint();">
<pre class="prettyprint lang-js">/*!
- * Ext JS Library 3.3.
0
- * Copyright(c) 2006-2010
Ext JS,
Inc.
- * licensing@
extjs
.com
- * http://www.
extjs
.com/license
+ * Ext JS Library 3.3.
1
+ * Copyright(c) 2006-2010
Sencha
Inc.
+ * licensing@
sencha
.com
+ * http://www.
sencha
.com/license
*/
<div id="cls-Ext.form.ComboBox"></div>/**
* @class Ext.form.ComboBox
*/
<div id="cls-Ext.form.ComboBox"></div>/**
* @class Ext.form.ComboBox
@@
-943,10
+943,16
@@
myCombo.keyNav.tab = function() { // Override TAB handling function
},
// private
},
// private
- assertValue
: function(){
+ assertValue : function(){
var val = this.getRawValue(),
var val = this.getRawValue(),
- rec
= this.findRecord(this.displayField, val)
;
+ rec;
+ if(this.valueField && Ext.isDefined(this.value)){
+ rec = this.findRecord(this.valueField, this.value);
+ }
+ if(!rec || rec.get(this.displayField) != val){
+ rec = this.findRecord(this.displayField, val);
+ }
if(!rec && this.forceSelection){
if(val.length > 0 && val != this.emptyText){
this.el.dom.value = Ext.value(this.lastSelectionText, '');
if(!rec && this.forceSelection){
if(val.length > 0 && val != this.emptyText){
this.el.dom.value = Ext.value(this.lastSelectionText, '');
@@
-955,11
+961,11
@@
myCombo.keyNav.tab = function() { // Override TAB handling function
this.clearValue();
}
}else{
this.clearValue();
}
}else{
- if(rec){
+ if(rec
&& this.valueField
){
// onSelect may have already set the value and by doing so
// set the display field properly. Let's not wipe out the
// valueField here by just sending the displayField.
// onSelect may have already set the value and by doing so
// set the display field properly. Let's not wipe out the
// valueField here by just sending the displayField.
- if (
val == rec.get(this.displayField) && this.value == rec.get(this.valueField)
){
+ if (
this.value == val
){
return;
}
val = rec.get(this.valueField || this.displayField);
return;
}
val = rec.get(this.valueField || this.displayField);