fix: Fix merge issues

algolia · Sep 15, 2015 · 3b5e8f4 · 3b5e8f4
1 parent a4199a5
commit 3b5e8f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/lib/utils.js b/lib/utils.js
@@ -33,6 +33,7 @@ function renderTemplate({template, templateHelpers, data}) {
         };
       };
     });
+    return data;
   }
 
   if (typeof template !== 'string' && typeof template !== 'function') {
@@ -44,13 +45,9 @@ function renderTemplate({template, templateHelpers, data}) {
   }
 
   if (typeof template === 'string') {
-    if (!data.helpers) {
-      data = addTemplateHelpersToData(data);
-    } else {
-      console.warn('TemplateHelpers not included because template data already contained a .helpers key');
-    }
+    data = addTemplateHelpersToData(data);
 
-    content = hogan.compile(this.props.template).render(data);
+    content = hogan.compile(template).render(data);
   }
 
   return content;

diff --git a/widgets/range-slider.js b/widgets/range-slider.js
@@ -53,7 +53,7 @@ function rangeSlider({
       helper.addNumericRefinement(facetName, '<=', newValues[1]);
       helper.search();
     },
-    render(results, state, helper) {
+    render({results, helper}) {
       var stats = results.getFacetStats(facetName);
       var currentRefinement = this._getCurrentRefinement(helper);