9c873f12 by Adam Heath

s/util/Util/ when calling mergeStaticProps.

1 parent f220646e
......@@ -194,7 +194,7 @@ define(function(require) {
};
},
searchParseDoc: function searchParseDoc(doc, index, itemHighlighting) {
var fieldsToParse = util.mergeStaticProps(this.constructor, Solr, {}, 'parsedFieldMap');
var fieldsToParse = Util.mergeStaticProps(this.constructor, Solr, {}, 'parsedFieldMap');
var result = {};
_.each(fieldsToParse, function(value, key) {
var parsed;
......@@ -242,7 +242,7 @@ define(function(require) {
result.sort = sort;
result.rows = pageSize;
result.start = (currentPage - 1) * pageSize;
result.fl = util.mergeStaticSets(constructor, Solr, [], 'returnFields');
result.fl = Util.mergeStaticSets(constructor, Solr, [], 'returnFields');
if (this.get('options').get('highlighting')) {
result.hl = true;
result['hl.fl'] = ['content', 'title'].concat(constructor.extraHighlightFields);
......