diff --git a/Gemfile b/Gemfile index f7b917df1..3c70e72a4 100644 --- a/Gemfile +++ b/Gemfile @@ -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 diff --git a/Gemfile.lock b/Gemfile.lock index 61ce28ff4..e2d476f3d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -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) diff --git a/lib/tasks/local_cmr.rake b/lib/tasks/local_cmr.rake index 4e5689b9b..ed0ff1f54 100644 --- a/lib/tasks/local_cmr.rake +++ b/lib/tasks/local_cmr.rake @@ -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}"