Merge pull request #450 from metamaps/feature/fix-searchbox

fix searchbox

app/assets/javascripts/src/Metamaps.GlobalUI.js.erb

@@ -614,14 +614,14 @@ Metamaps.GlobalUI.Search = {
 
         self.hideLoader();
 
-        if (datum.rtype != "noresult") {
+        if (["topic", "map", "mapper"].indexOf(datum.rtype) !== -1) {
             self.close(0, true);
             var win;
-            if (dataset == "topics") {
+            if (datum.rtype == "topic") {
                 Metamaps.Router.topics(datum.id);
-            } else if (dataset == "maps") {
+            } else if (datum.rtype == "map") {
                 Metamaps.Router.maps(datum.id);
-            } else if (dataset == "mappers") {
+            } else if (datum.rtype == "mapper") {
                 Metamaps.Router.explore("mapper", datum.id);
             }
         }

app/assets/stylesheets/search.scss.erb

@@ -19,12 +19,6 @@
   }
 }
 
-.explorePage .sidebarSearchField,
-.explorePage .sidebarSearch .tt-hint {
-	width: 380px;
-	padding: 5px 10px 5px 10px;
-}
-
 .sidebarSearchIcon {
   float: left;
   width: 72px;

app/views/main/home.html.erb

@@ -47,7 +47,7 @@
     Metamaps.Maps.Active = <%= @maps.to_json.html_safe %>;
     Metamaps.currentSection = "";
     Metamaps.currentPage = "";
-    Metamaps.GlobalUI.Search.isOpen = true;
+    Metamaps.GlobalUI.Search.open();
     Metamaps.GlobalUI.Search.lock();
     </script>
 <% end %>