Skip to content

Commit e603120

Browse files
committed
Make the clipboard dependency an NPM dependency
The rails version is out of date with the javascript version and hasn't been updated in 6 years
1 parent cf2f074 commit e603120

File tree

5 files changed

+7
-3
lines changed

5 files changed

+7
-3
lines changed

app/assets/javascripts/spotlight/admin/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
//= require parameterize
66
//= require bootstrap-tagsinput
77
//= require jquery.serializejson
8-
//= require clipboard
8+
//= require clipboard/dist/clipboard
99
//= require leaflet
1010
//= require leaflet-iiif
1111
//= require Leaflet.Editable

blacklight-spotlight.gemspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ these collections.)
2929
s.add_dependency 'breadcrumbs_on_rails', '>= 3.0', '< 5'
3030
s.add_dependency 'cancancan'
3131
s.add_dependency 'carrierwave', '~> 2.2'
32-
s.add_dependency 'clipboard-rails', '~> 1.5'
3332
s.add_dependency 'devise', '~> 4.1'
3433
s.add_dependency 'devise_invitable'
3534
s.add_dependency 'faraday'

lib/generators/spotlight/install_generator.rb

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@ class Install < Rails::Generators::Base
1111
class_option :mailer_default_url_host, type: :string, default: '' # e.g. localhost:3000
1212

1313
def add_js
14+
say 'Install Clipboard'
15+
run 'yarn add [email protected]'
16+
1417
gem 'shakapacker'
1518
Bundler.with_clean_env { run 'bundle install' }
1619

lib/spotlight/engine.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
require 'activejob-status'
1010
require 'autoprefixer-rails'
1111
require 'blacklight'
12-
require 'clipboard/rails'
1312
require 'faraday'
1413
require 'faraday/follow_redirects'
1514
require 'friendly_id'
@@ -67,6 +66,8 @@ class Engine < ::Rails::Engine
6766
end
6867

6968
initializer 'spotlight.assets.precompile' do |app|
69+
config.assets.paths << Rails.root.join('node_modules')
70+
7071
app.config.assets.precompile += %w[spotlight/default_thumbnail.jpg spotlight/default_browse_thumbnail.jpg]
7172

7273
Sprockets::ES6.configuration = { 'modules' => 'umd', 'moduleIds' => true }

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,5 +25,6 @@
2525
"not IE 11"
2626
],
2727
"dependencies": {
28+
"clipboard": "1.7.1"
2829
}
2930
}

0 commit comments

Comments
 (0)