Skip to content
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

Display Bootstrap-like tooltips for menu items #1249

Open
wants to merge 20 commits into
base: main
Choose a base branch
from
Open

Display Bootstrap-like tooltips for menu items #1249

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
87f5076
detect key from longer URL
vanithaak Oct 16, 2022
f6225c3
Merge branch 'main' of https://github.com/vanithaak/Leaflet.Distortab…
vanithaak Oct 17, 2022
4976617
Merge branch 'publiclab:main' into main
vanithaak Oct 19, 2022
c71fc06
Merge branch 'publiclab:main' into main
vanithaak Oct 19, 2022
8db3a8e
Merge branch 'publiclab:main' into main
vanithaak Oct 19, 2022
1dca9e3
Merge branch 'publiclab:main' into main
vanithaak Oct 20, 2022
7cbcb80
fixes
vanithaak Oct 20, 2022
24df784
Merge branch 'main' of https://github.com/vanithaak/Leaflet.Distortab…
vanithaak Oct 20, 2022
47f1aa2
Merge branch 'publiclab:main' into main
vanithaak Oct 21, 2022
07c7e94
Merge branch 'publiclab:main' into main
vanithaak Oct 21, 2022
773c2fe
Merge branch 'publiclab:main' into main
vanithaak Oct 22, 2022
13c6402
Merge branch 'publiclab:main' into main
vanithaak Oct 23, 2022
67b2862
updates
vanithaak Oct 23, 2022
54b59a3
Merge branch 'publiclab:main' into main
vanithaak Oct 25, 2022
439e1f3
Merge branch 'publiclab:main' into main
vanithaak Oct 25, 2022
5af6baf
bootstrap tooltip
vanithaak Oct 27, 2022
8a74edb
error fixes
vanithaak Oct 27, 2022
bae479d
Merge branch 'main' into tooltip
vanithaak Oct 28, 2022
87ab889
data-bs-toggle: tooltip, instead of top
vanithaak Oct 28, 2022
bee6134
Merge branch 'main' into tooltip
vanithaak Nov 3, 2022
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
13 changes: 9 additions & 4 deletions dist/leaflet.distortableimage.js
View file
Open in desktop

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

3 changes: 0 additions & 3 deletions examples/archive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,6 @@ <h3 id="offcanvasRightLabel">Images</h3>
form.addEventListener('submit', (event) => {
event.preventDefault();
const url = input.value.replace('details', 'metadata');
let splitUrl = url.split('/');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

First, just noting this seems like an unrelated change -- can you try reverting it with:

cd examples
wget https://raw.githubusercontent.com/publiclab/Leaflet.DistortableImage/main/examples/archive.html
cd ../
git add dist
git commit -m 'removed unrelated changes'
git push

let detectKey = splitUrl[splitUrl.length - 2];
console.log("detected key", detectKey);
let fetchedFrom
axios.get(url)
.then((response) => {
Expand Down
3 changes: 3 additions & 0 deletions examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,16 @@
<link rel="stylesheet" href="../dist/vendor.css">
<link rel="stylesheet" href="../dist/leaflet.distortableimage.css" media="screen" title="no title">
<link rel="stylesheet" href="https://unpkg.com/leaflet-control-geocoder/dist/Control.Geocoder.css" />
<link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-Zenh87qX5JnK2Jl0vWa8Ck2rdkQ2Bzep5IDxbcnCeuOxjzrPF/et3URy9Bv1WTRi" crossorigin="anonymous">

<script src="../node_modules/leaflet/dist/leaflet.js" type="text/javascript" charset="utf-8"></script>
<script src="../dist/vendor.js"></script>
<script src="../dist/leaflet.distortableimage.js"></script>
<script src="./js/index.js" defer></script>
<script src="https://maps.googleapis.com/maps/api/js?key=<key>&libraries=places"></script>
<script src="https://unpkg.com/leaflet-control-geocoder/dist/Control.Geocoder.js"></script>
<script src="https://cdn.jsdelivr.net/npm/@popperjs/[email protected]/dist/umd/popper.min.js" integrity="sha384-oBqDVmMz9ATKxIep9tiCxS/Z9fNfEXiDAYTujMAeBAsjFuCZSmKbSSUnQlmh/jp3" crossorigin="anonymous"></script>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/bootstrap.min.js" integrity="sha384-IDwe1+LCz02ROU9k972gdyvl+AESN10+x7tBKgc9I5HFtuNz0wWnPclzo6p9vxnk" crossorigin="anonymous"></script>
</head>
<body style="margin:0;">
<form id="test_form">
Expand Down
2 changes: 2 additions & 0 deletions examples/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="top"]')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, here is I think the issue. tooltipTriggerList evaluates to an empty NodeList. I think we're running this code too early. If you want to run it AFTER page JS activity is complete, we can put it under the (function() { line. That defers execution until the page is ready. Can we do that? We may need to define it with global scope above, then set it once the page is ready.

Copy link
Contributor Author

@vanithaak vanithaak Nov 3, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, I tried what you suggested

let tooltipTriggerList;
let tooltipList;
let map;

(function() {
  map = L.map('map').setView([51.505, -0.09], 13);
  map.addGoogleMutant();

  map.whenReady(function() {
    tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
    tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
    img = L.distortableImageOverlay('example.jpg', {
      selected: true,
      fullResolutionSrc: 'large.jpg',
    }).addTo(map);
  });
})();

L.Control.geocoder().addTo(map);

This is how it looks like now. I'm still not able to see the tooltip : (

const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
let map;

(function() {
Expand Down
5 changes: 4 additions & 1 deletion src/edit/actions/EditAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ L.EditAction = L.Toolbar2.Action.extend({
}

this._link.setAttribute('href', '#');
this._link.setAttribute('title', iconOptions.tooltip);
// this._link.setAttribute('title', iconOptions.tooltip);
this._link.setAttribute('role', 'button');
this._link.setAttribute('data-bs-toggle', 'tooltip');
this._link.setAttribute('data-bs-placement', 'top');
this._link.setAttribute('data-bs-title', iconOptions.tooltip);

L.DomUtil.addClass(this._link, this.constructor.baseClass);

Expand Down