Revert "potentially fix category issue"

This reverts commit 6e35a52.

Author: jtutuncumacias

javascripts/data.js

@@ -16,12 +16,7 @@ NH.data = NH.data || {};
 
     var healthyMarkets = [];
 
-    data.setCategory = function(category){
-      yelpCategories = [];
-      yelpCategories.push(category);      
-
-    }
-
+    
     var showHealthyMarketSearchResults = function(){
 
 

javascripts/search.js

@@ -59,9 +59,6 @@ var updatedDirections = function(){
   var t_lon = Math.max(resultLeg.start_location.B, resultLeg.end_location.B);
   var b_lon = Math.min(resultLeg.start_location.B, resultLeg.end_location.B);
 
-  var category = NH.data.setCategory$('#category_filter').val();
-
-
   var def = NH.data.getHealthyMarkets(t_lat, b_lat, t_lon, b_lon);
 }
 

search.html

@@ -54,7 +54,7 @@
           Category:
         </span>
         <div class="styled-select">
-          <select id="category_filter">
+          <select>
             <option value="disabled">Select Category</option>
             <optgroup label="Food">
               <option value="food">All</option>
@@ -145,11 +145,21 @@
               <option value="trinidadian">Trinidadian</option>
               <option value="catalan">Catalan</option>
               <option value="cheesesteaks">Cheesesteaks</option>
+<<<<<<< HEAD
               <option value="chicken_wings">Chicken Wings</option>
               <option value="chinese">Chinese</option>
               <option value="cantonese">Cantonese</option>
               <option value="dimsum">Dim Sum</option>
               <option value="shanghainese">Shanghainese</option>
+=======
+
+<!--              
+              <option value="Chicken Wings", "chicken_wings"</option>
+              <option value="Chinese", "chinese"</option>
+              <option value="Cantonese", "cantonese"</option>
+              <option value="Dim Sum", "dimsum"</option>
+              <option value="Shanghainese", "shanghainese"</option>
+>>>>>>> FETCH_HEAD
               <option value="Szechuan", "szechuan"</option>
               <option value="Comfort Food", "comfortfood"</option>
               <option value="Creperies", "creperies"</option>
@@ -221,6 +231,7 @@
               <option value="Steakhouses", "steak"</option>
               <option value="Sushi Bars", "sushi"</option>
               <option value="Taiwanese", "taiwanese"</option>
+<<<<<<< HEAD
               <option value="tapas"</option>
               <option value="tapasmallplates">Tapas/Small Plates</option>
               <option value="tex-mex">Tex-Mex</option>
@@ -231,6 +242,19 @@
               <option value="vegan">Vegan</option>
               <option value="vegetarian">Vegetarian</option>
               <option value="vietnamese">Vietnamese</option>
+=======
+              <option value="Tapas Bars", "tapas"</option>
+              <option value="Tapas/Small Plates", "tapasmallplates"</option>
+              <option value="Tex-Mex", "tex-mex"</option>
+              <option value="Thai", "thai"</option>
+              <option value="Turkish", "turkish"</option>
+              <option value="Ukrainian", "ukrainian"</option>
+              <option value="Uzbek", "uzbek"</option>
+              <option value="Vegan", "vegan"</option>
+              <option value="Vegetarian", "vegetarian"</option>
+              <option value="Vietnamese", "vietnamese"</option>
+// -->
+>>>>>>> FETCH_HEAD
             </optgroup>
           </select>
         </div>