Skip to content

FIX: support subfolder on imagePath #104

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

Merged
merged 4 commits into from
Dec 5, 2023
Merged

FIX: support subfolder on imagePath #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6cceebf
FIX: support subfolder on imagePath
renato Dec 1, 2023
765b423
DEV: linting
renato Dec 1, 2023
c5647b5
Merge branch 'paviliondev:main' into main
renato Dec 3, 2023
f1bf834
DEV: bump plugin version
renato Dec 4, 2023
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
5 changes: 4 additions & 1 deletion assets/javascripts/discourse/lib/map-utilities.js.es6
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import { emojiUnescape } from "discourse/lib/text";
import DiscourseURL from "discourse/lib/url";
import getURL from "discourse-common/lib/get-url";

const generateMap = function (siteSettings, opts) {
const element = document.createElement("div");
Expand Down Expand Up @@ -33,7 +34,9 @@ const generateMap = function (siteSettings, opts) {

L.tileLayer(siteSettings.location_map_tile_layer, tileOpts).addTo(map);

L.Icon.Default.imagePath = "/plugins/discourse-locations/leaflet/images/";
L.Icon.Default.imagePath = getURL(
"/plugins/discourse-locations/leaflet/images/"
);

L.control.zoom({ position: "bottomleft" }).addTo(map);

Expand Down
2 changes: 1 addition & 1 deletion plugin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true
# name: discourse-locations
# about: Tools for handling locations in Discourse
# version: 6.5.2
# version: 6.5.3
# authors: Angus McLeod, Robert Barrow
# contact_emails: development@pavilion.tech
# url: https://github.com/angusmcleod/discourse-locations
Expand Down