Andreas/tracks
1
0
Fork 0
mirror of https://github.com/TracksApp/tracks.git synced 2026-02-15 03:38:08 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use jquery-ui-rails gem instead of vendored jQuery UI

Browse source
This commit is contained in:
Dan Rice 2016-01-30 15:45:48 -05:00
parent 3220177dd3
commit 2ea20d1a1e
32 changed files with 24 additions and 160 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -14,13 +14,26 @@
//= require jquery_ujs
//= require bootstrap-sprockets
//= require jquery-ui/autocomplete
//= 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/droppable
//= require jquery-ui/effect-highlight
//= require jquery-ui/sortable
// Stuff in app/assets
//= require tracks
//= require tracks_pages
//= require disable_fx_in_test
// Stuff in vendor/assets
//= require jquery-ui-1.10.0.custom.min
//= require jquery.ui.touch-punch.min
//= require jquery.blockUI
//= require jquery.cookie

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

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

5
app/assets/stylesheets/application.css.scss
View file

@ -13,7 +13,10 @@
*= require_self
*/
@import "../../../vendor/assets/stylesheets/jquery-ui-1.10.0.custom.min";
@import "jquery-ui/autocomplete";
@import "jquery-ui/datepicker";
@import "jquery-ui/dialog";
@import "jquery-ui/sortable";
.legacy-ui {
@import "../../../vendor/assets/stylesheets/superfish-navbar";

8
app/helpers/application_helper.rb
View file

@ -169,14 +169,6 @@ module ApplicationHelper
return js.html_safe
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("i18n/jquery.ui.datepicker-#{locale}.js")
end
end
def done_path(controller_name, type)
case controller_name
when "contexts"