Skip to content

Commit

Permalink
Merge pull request #8000 from spark-solutions/feature/update-jquery-u…
Browse files Browse the repository at this point in the history
…i-rails

Update jquery-ui-rails (6.0.1) & remove extra assets
  • Loading branch information
damianlegawiec committed May 15, 2017
2 parents 04dbedf + d8b6b35 commit ad0f2a4
Show file tree
Hide file tree
Showing 17 changed files with 5 additions and 362 deletions.
6 changes: 3 additions & 3 deletions backend/app/assets/javascripts/spree/backend.js
Expand Up @@ -5,9 +5,9 @@
//= require jquery.cookie
//= require jquery.jstree/jquery.jstree
//= require jquery_ujs
//= require jquery-ui/datepicker
//= require jquery-ui/sortable
//= require jquery-ui/autocomplete
//= require jquery-ui/widgets/datepicker
//= require jquery-ui/widgets/sortable
//= require jquery-ui/widgets/autocomplete
//= require select2
//= require underscore-min.js
//= require velocity
Expand Down
2 changes: 1 addition & 1 deletion backend/config/initializers/assets.rb
@@ -1 +1 @@
Rails.application.config.assets.precompile += %w( jquery-ui/* admin/* credit_cards/credit_card.gif )
Rails.application.config.assets.precompile += %w( admin/* credit_cards/credit_card.gif )
2 changes: 1 addition & 1 deletion backend/spree_backend.gemspec
Expand Up @@ -24,6 +24,6 @@ Gem::Specification.new do |s|

s.add_dependency 'bootstrap-sass', '~> 3.3'
s.add_dependency 'jquery-rails', '~> 4.1'
s.add_dependency 'jquery-ui-rails', '~> 5.0'
s.add_dependency 'jquery-ui-rails', '~> 6.0.1'
s.add_dependency 'select2-rails', '3.5.9.1' # 3.5.9.2 breaks several specs
end
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
357 changes: 0 additions & 357 deletions backend/vendor/assets/stylesheets/jquery-ui.datepicker.css.erb

This file was deleted.

0 comments on commit ad0f2a4

Please sign in to comment.