Skip to content

Commit 90d387c

Browse files
committed
Merge branch 'rkok-master'
2 parents a55e91a + 5b03d90 commit 90d387c

4 files changed

Lines changed: 26 additions & 25 deletions

File tree

dist/filter.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*
22
* filter.js
3-
* 2.1.0 (2016-08-09)
3+
* 2.1.0 (2018-02-18)
44
*
55
* Released under the MIT license
66
* http://opensource.org/licenses/MIT
77
*
8-
* Copyright 2011-2016 Jiren Patel[jirenpatel@gmail.com]
8+
* Copyright 2011-2018 Jiren Patel[jirenpatel@gmail.com]
99
*
1010
* Dependency:
1111
* jQuery(v1.9 >=)
@@ -1165,7 +1165,7 @@
11651165
});
11661166

11671167
this.anyFilterSelected = count > 0;
1168-
criteria = count ? this.Model.where(query) : this.Model;
1168+
criteria = this.Model.where(query);
11691169
this.execCallback('shortResult', criteria);
11701170
this.last_result = criteria.all;
11711171

@@ -1440,7 +1440,7 @@
14401440
};
14411441

14421442
F.parseValues = function(field, values){
1443-
var type = this.Model.schema[field];
1443+
var type = typeof this.Model.schema == 'undefined' ? 'String' : this.Model.schema[field];
14441444

14451445
if(type == 'Number'){
14461446
return $.map(values, function(v){ return Number(v) });

0 commit comments

Comments
 (0)