Skip to content

MMT-2288 Update jquery version that is being package for the preview gem #611

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 9, 2020
Merged

MMT-2288 Update jquery version that is being package for the preview gem #611

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc6e72a
MMT-2288 updated version for preview gem
ryanmiller-1 Jul 1, 2020
2cfc6f3
MMT-2288 updating preview gem commit ref.
ryanmiller-1 Jul 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Gemfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ gem 'browser'
# bundle config local.cmr_metadata_preview /path/to/local/git/repository
# make sure to delete the local config when done making changes to merge into master
# bundle config --delete local.cmr_metadata_preview
gem 'cmr_metadata_preview', git: 'https://git.earthdata.nasa.gov/scm/cmr/cmr_metadata_preview.git', ref: 'fff65949cc6'
gem 'cmr_metadata_preview', git: 'https://git.earthdata.nasa.gov/scm/cmr/cmr_metadata_preview.git', ref: '1f6ffd54d65'

group :development, :test do
# Call 'byebug' anywhere in the code to stop execution and get a debugger console
Expand Down
6 changes: 3 additions & 3 deletions Gemfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
GIT
remote: https://git.earthdata.nasa.gov/scm/cmr/cmr_metadata_preview.git
revision: fff65949cc62d397b0675e9fe46e962b8cf43228
ref: fff65949cc6
revision: 1f6ffd54d6570f9f920078a84fd51750db3c21ab
ref: 1f6ffd54d65
specs:
cmr_metadata_preview (0.2.2)
cmr_metadata_preview (0.2.3)
georuby
rails (~> 5.2.0)
sprockets (< 4.0)
Expand Down
8 changes: 4 additions & 4 deletions lib/tasks/local_cmr.rake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,11 @@ namespace :cmr do
File.join(Rails.root.to_s, 'vendor', 'assets', 'javascripts', 'eui-1.0.0', 'eui.js')
]

# TODO: move to version 3 of jquery
# it is not currently understood how this section works to select jquery
# currently the preview gem is not running with version 3, but 1
# Find the path to jquery
jquery = Rails.application.config.assets.paths.select { |p| p.to_s.include?('jquery-rails') }
dependencies.unshift(File.join(jquery.first, 'jquery.js')) if jquery.any?
# Include a specific file. jquery-rails has files for each major version
# stored in the above location
dependencies.unshift(File.join(jquery.first, 'jquery3.js')) if jquery.any?

js_to_uglify = dependencies.sort.map do |file|
puts "- Reading #{file}"
Expand Down