Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2025-12-16 15:20:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Include datepicker i18n only as needed

Browse source 
* Restore the javascript_tag_for_i18n_datepicker helper (and actually use it)
* Include the datepicker i18n JS in the asset precompilation list
This commit is contained in:
Dan Rice 2016-02-16 22:08:15 -05:00
parent 91849c5316
commit 4b046b98ea
5 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/assets/javascripts/application.js
View file

@ -16,13 +16,6 @@
//= require jquery-ui/autocomplete //= require jquery-ui/autocomplete
//= require jquery-ui/datepicker //= require jquery-ui/datepicker
//= require jquery-ui/datepicker-cs
//= require jquery-ui/datepicker-de
//= require jquery-ui/datepicker-es
//= require jquery-ui/datepicker-fr
//= require jquery-ui/datepicker-he
//= require jquery-ui/datepicker-nl
//= require jquery-ui/datepicker-ru
//= require jquery-ui/dialog //= require jquery-ui/dialog
//= require jquery-ui/droppable //= require jquery-ui/droppable
//= require jquery-ui/effect-highlight //= require jquery-ui/effect-highlight

1
app/assets/javascripts/tracks_pages.js
View file

@ -111,7 +111,6 @@ var TracksPages = {
TodoItems.setup_autocomplete_for_predecessor(); TodoItems.setup_autocomplete_for_predecessor();
}, },
setup_datepicker: function() { setup_datepicker: function() {
$.datepicker.setDefaults($.datepicker.regional[i18n_locale]);
$('input.Date').datepicker({ $('input.Date').datepicker({
'dateFormat': dateFormat, 'dateFormat': dateFormat,
'firstDay': weekStart, 'firstDay': weekStart,

8
app/helpers/application_helper.rb
View file

@ -169,6 +169,14 @@ module ApplicationHelper
return js.html_safe return js.html_safe
end end
def javascript_tag_for_i18n_datepicker
locale = I18n.locale
# do not include en as locale since this the available by default
if locale && locale != :en
javascript_include_tag("jquery-ui/datepicker-#{locale}")
end
end
def done_path(controller_name, type) def done_path(controller_name, type)
case controller_name case controller_name
when "contexts" when "contexts"

1
app/views/layouts/application.html.erb
View file

@ -25,6 +25,7 @@
setup_periodic_check("<%=check_deferred_todos_path(:format => 'js')%>", 10*60, 'POST'); setup_periodic_check("<%=check_deferred_todos_path(:format => 'js')%>", 10*60, 'POST');
<%= generate_i18n_strings %> <%= generate_i18n_strings %>
</script> </script>
<%= javascript_tag_for_i18n_datepicker %>
<%= favicon_link_tag 'favicon.ico' %> <%= favicon_link_tag 'favicon.ico' %>
<%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %> <%= favicon_link_tag 'apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png' %>
<%= auto_discovery_link_tag(:rss, {:controller => "todos", :action => "index", :format => 'rss', :token => "#{current_user.token}"}, {:title => t('layouts.next_actions_rss_feed')}) %> <%= auto_discovery_link_tag(:rss, {:controller => "todos", :action => "index", :format => 'rss', :token => "#{current_user.token}"}, {:title => t('layouts.next_actions_rss_feed')}) %>

2
config/initializers/assets.rb
View file

@ -5,7 +5,7 @@ Rails.application.config.assets.version = '1.0'
# Precompile additional assets. # Precompile additional assets.
# application.js, application.css, and all non-JS/CSS in app/assets folder are already added. # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
Rails.application.config.assets.precompile += %w( print.css mobile.css ) Rails.application.config.assets.precompile += %w( print.css mobile.css jquery-ui/datepicker-*.js )
# add /app/assets/swfs to asset pipeline for charts # add /app/assets/swfs to asset pipeline for charts
Rails.application.config.assets.paths << Rails.root.join("app", "assets", "swfs") Rails.application.config.assets.paths << Rails.root.join("app", "assets", "swfs")