Skip to content

Commit

Permalink
fix filterbar issue when store data type is Date
Browse files Browse the repository at this point in the history
  • Loading branch information
yurychika committed Jan 21, 2014
1 parent db8ac89 commit 2a6d8a0
Showing 1 changed file with 9 additions and 5 deletions.
14 changes: 9 additions & 5 deletions modules/filter/FilterBar.js
Expand Up @@ -553,7 +553,7 @@ define([
var converters = {
custom: c.dataTypeArgs && c.dataTypeArgs.converter && lang.isFunction(c.dataTypeArgs.converter)?
c.dataTypeArgs.converter : null,
data: dc,
date: dc,
time: tc
};
var c = data.condition, exp, isNot = false, type = c == 'isEmpty' ? 'string' : type; //isEmpty always treat type as string
Expand All @@ -575,16 +575,20 @@ define([
}
return exp;
},
_stringToDate: function(s, pattern){
pattern = pattern || /(\d{4})\/(\d\d?)\/(\d\d?)/;
_stringToDate: function(s){
if(s instanceof Date){return s;}

pattern = /(\d{4})\/(\d\d?)\/(\d\d?)/;
pattern.test(s);
var d = new Date();
d.setFullYear(parseInt(RegExp.$1));
d.setMonth(parseInt(RegExp.$2)-1);
return d;
},
_stringToTime: function(s, pattern){
pattern = pattern || /(\d\d?):(\d\d?):(\d\d?)/;
_stringToTime: function(s){
if(s instanceof Date){return s;}

pattern = /(\d\d?):(\d\d?):(\d\d?)/;
pattern.test(s);
var d = new Date();
d.setHours(parseInt(RegExp.$1));
Expand Down

0 comments on commit 2a6d8a0

Please sign in to comment.