9c873f12 by Adam Heath

s/util/Util/ when calling mergeStaticProps.

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