glenux-contrib/metamaps--metamaps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

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

Browse source 
fix searchbox
This commit is contained in:
Devin Howard 2015-12-24 15:44:12 +08:00
parent 6db91ea703 40561c629a
commit 844a52fc52
3 changed files with 5 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/src/Metamaps.GlobalUI.js.erb
View file

@ -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);
}
}

6
app/assets/stylesheets/search.scss.erb
View file

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

2
app/views/main/home.html.erb
View file

@ -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 %>