Download as
Browse Code »

Commit be50abba51847fca6c3efb2ce30d1d0d6646c5bf

Authored by Rodrigo Souto
1 parent 1672fd6e
Exists in master and in 22 other branches angular_poc, api-article-archived, article-readonly, backup-7-jan-2016, captcha_serpro_plugin, content-manager-hostspot, export-comment-paragraph, fix_event_date_issue, login-captcha, master_rails3, new_video_plugin, pg_search_rank, production, refactor_with_role, refactor_with_role_scope, remove_profile_cat_icons, resend_confirmation_email, staging, staging_rails3, tasks_keep_filter_params, theme-brasil-digital-from-staging, travis

search: google-maps is loaded only once 

Google Maps lib was being loaded on every submit. I moved the include to
the search page, outside the search content.
Showing 4 changed files with 6 additions and 7 deletions   Show diff stats
app/views/search/_google_maps.html.erb
  Diff comments   View file @be50abb
... ... @@ -3,12 +3,7 @@
3 3 <div id="map"></div>
4 4 </div>
5 5  
6   -<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
7   -<%= javascript_include_tag('google_maps') %>
8   -
9   -<%
10   - icon = default_or_themed_icon("/images/icons-map/enterprise.png")
11   -%>
  6 +<% icon = default_or_themed_icon("/images/icons-map/enterprise.png") %>
12 7  
13 8 <script type='text/javascript'>
14 9 mapLoad(<%= GoogleMaps.initial_zoom.to_json %>);
... ...
app/views/search/search_page.html.erb
  Diff comments   View file @be50abb
... ... @@ -10,3 +10,6 @@
10 10 <% end %>
11 11  
12 12 <%= javascript_include_tag 'search' %>
  13 +
  14 +<%= content_tag('script', '', :src => "http://maps.google.com/maps/api/js?sensor=true", :type => 'text/javascript') %>
  15 +<%= javascript_include_tag('google_maps') %>
... ...
public/javascripts/search.js
  Diff comments   View file @be50abb
... ... @@ -10,7 +10,7 @@
10 10 return false;
11 11 });
12 12  
13   - // Sorting
  13 + // Sorting and Views
14 14 $('#search-filters select').change(function(){
15 15 $('form.search_form').submit();
16 16 });
... ...
public/stylesheets/application.css
  Diff comments   View file @be50abb
... ... @@ -1667,6 +1667,7 @@ a.button.disabled, input.disabled {
1667 1667 }
1668 1668 #map {
1669 1669 height: 500px;
  1670 + margin-top: 10px;
1670 1671 }
1671 1672 .map {
1672 1673 clear: both;
... ...