Skip to content

Commit

Permalink
Fix Bootstrap tooltips
Browse files Browse the repository at this point in the history
bkeepers committed Feb 29, 2024
1 parent abb7277 commit 0da0b36
Showing 8 changed files with 18 additions and 23 deletions.
3 changes: 2 additions & 1 deletion lib/flipper/ui/action.rb
Original file line number Diff line number Diff line change
@@ -291,8 +291,9 @@ def popper_js
end

def asset_hash(src)
v = ENV["RACK_ENV"] == "development" ? Time.now.to_i : Flipper::VERSION
{
src: "#{src}?v=#{Flipper::VERSION}",
src: "#{src}?v=#{v}",
hash: SOURCES[src]
}
end
4 changes: 4 additions & 0 deletions lib/flipper/ui/public/js/application.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
document.addEventListener("DOMContentLoaded", function () {
document.querySelectorAll('[data-bs-toggle="tooltip"]').forEach(function(el) {
new bootstrap.Tooltip(el)
})

document.querySelectorAll(".js-toggle-trigger").forEach(function (trigger) {
trigger.addEventListener("click", function () {
var container = this.closest(".js-toggle-container");
9 changes: 5 additions & 4 deletions lib/flipper/ui/public/js/popper.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion lib/flipper/ui/sources.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"/css/bootstrap.min.css": "sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH",
"/js/bootstrap.min.js": "sha384-0pUGZvbkm6XF6gxjEnlmuGrJXVbNuzT9qBBavbLwCsOGabYfZo0T0to5eqruptLy",
"/js/popper.min.js": "sha384-wtNlGLUJ2I0nMcuD4N4C2l3SrJdgaRpeu64hbXM9GHBPIEAQZqtmrvsJZAIL10I0"
"/js/popper.min.js": "sha384-I7E8VVD/ismYTF4hNIPjVp/Zjvgyol6VFvRkX/vR+Vc4jQkC+hVqc2pM8ODewa9r"
}
2 changes: 1 addition & 1 deletion lib/flipper/ui/views/layout.erb
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@
<% end %>
</div>

<script src="<%= script_name + popper_js[:src] %>" type="module" integrity="<%= popper_js[:hash] %>" crossorigin="anonymous"></script>
<script src="<%= script_name + popper_js[:src] %>" integrity="<%= popper_js[:hash] %>" crossorigin="anonymous"></script>
<script src="<%= script_name + bootstrap_js[:src] %>" integrity="<%= bootstrap_js[:hash] %>" crossorigin="anonymous"></script>
<script src="<%= script_name %>/js/application.js?v=<%= Flipper::VERSION + Time.now.to_s %>"></script>
<script src="<%= script_name %>/js/version.js?v=<%= Flipper::VERSION %>"></script>
15 changes: 2 additions & 13 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"private": true,
"dependencies": {
"bootstrap": "^5.3.3",
"popper.js": "^1.16.1"
"@popperjs/core": "^2.11.8",
"bootstrap": "^5.3.3"
},
"scripts": {
"postinstall": "script/vendor-assets"
2 changes: 1 addition & 1 deletion script/vendor-assets
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ require 'json'
sources = [
"bootstrap/dist/css/bootstrap.min.css",
"bootstrap/dist/js/bootstrap.min.js",
"popper.js/dist/popper.min.js"
"@popperjs/core/dist/umd/popper.min.js"
]

integrity = sources.map do |src|

0 comments on commit 0da0b36

Please sign in to comment.