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]
/
src
/
data
/
Types.js
diff --git
a/src/data/Types.js
b/src/data/Types.js
index
8a2a8f2
..
884bf2e
100644
(file)
--- a/
src/data/Types.js
+++ b/
src/data/Types.js
@@
-1,8
+1,8
@@
/*!
/*!
- * Ext JS Library 3.
2.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
*/
/**
* @class Ext.data.Types
*/
/**
* @class Ext.data.Types
@@
-93,7
+93,7
@@
Ext.data.Types = new function(){
INT: {
convert: function(v){
return v !== undefined && v !== null && v !== '' ?
INT: {
convert: function(v){
return v !== undefined && v !== null && v !== '' ?
- parseInt(String(v).replace(Ext.data.Types.stripRe, ''), 10) :
0
;
+ parseInt(String(v).replace(Ext.data.Types.stripRe, ''), 10) :
(this.useNull ? null : 0)
;
},
sortType: st.none,
type: 'int'
},
sortType: st.none,
type: 'int'
@@
-108,7
+108,7
@@
Ext.data.Types = new function(){
FLOAT: {
convert: function(v){
return v !== undefined && v !== null && v !== '' ?
FLOAT: {
convert: function(v){
return v !== undefined && v !== null && v !== '' ?
- parseFloat(String(v).replace(Ext.data.Types.stripRe, ''), 10) :
0
;
+ parseFloat(String(v).replace(Ext.data.Types.stripRe, ''), 10) :
(this.useNull ? null : 0)
;
},
sortType: st.none,
type: 'float'
},
sortType: st.none,
type: 'float'