Merge branch 'master' of github.com:okfn/recline

2012-12-22 19:54:48 +00:00
parent 3610d95e74 5691466cda
commit 64af7b2150
4 changed files with 493 additions and 5 deletions
--- a/src/model.js
+++ b/src/model.js
@@ -499,11 +499,7 @@ my.Query = Backbone.Model.extend({
    var ourfilter = JSON.parse(JSON.stringify(filter));
    // not fully specified so use template and over-write
    if (_.keys(filter).length <= 3) {
-      ourfilter = _.extend(
-        // crude deep copy
-        JSON.parse(JSON.stringify(this._filterTemplates[filter.type])),
-        ourfilter
-      );
+      ourfilter = _.defaults(ourfilter, this._filterTemplates[filter.type]);
    }
    var filters = this.get('filters');
    filters.push(ourfilter);