Skip to content

Commit

Permalink
Don't use javascript_pack_tag; import js modules to application.js
Browse files Browse the repository at this point in the history
fixes #2531
followup to #2523
  • Loading branch information
hackartisan committed Feb 5, 2019
1 parent 287c5f5 commit af010b1
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 2 additions & 0 deletions app/javascript/packs/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import DocumentAdder from '../components/document_adder'
import PlaylistMembers from '../components/playlist_members'
import axios from 'axios'
import OrderManager from '../components/OrderManager.vue'
import setupAuthLinkClipboard from '../packs/auth_link_clipboard.js'

Vue.use(system)

Expand All @@ -26,4 +27,5 @@ document.addEventListener('DOMContentLoaded', () => {
}
})
}
setupAuthLinkClipboard()
})
4 changes: 2 additions & 2 deletions app/javascript/packs/auth_link_clipboard.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import Clipboard from 'clipboard'

document.addEventListener('DOMContentLoaded', () => {
export default function setupAuthLinkClipboard () {
let div = document.getElementById('clipboard-trigger-holder')
div.innerHTML = '<button class="btn btn-primary" id="clipboard-trigger">Copy link to clipboard</button>'
new Clipboard('#clipboard-trigger', {
Expand All @@ -9,4 +9,4 @@ document.addEventListener('DOMContentLoaded', () => {
return url
}
})
})
}
1 change: 0 additions & 1 deletion app/views/catalog/_auth_link_default.html.erb
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<%= javascript_pack_tag 'auth_link_clipboard' %>
<% if @change_set.respond_to?(:auth_token) && @change_set.resource.decorate.public_readable_state? %>
<div id="auth_link" class="panel panel-default auth-link">
<div class="panel-heading">
Expand Down

0 comments on commit af010b1

Please sign in to comment.