Skip to content

fix: strip hash prefix from marker colors in URL construction #116

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

Closed
fank wants to merge 1 commit into from
Closed

fix: strip hash prefix from marker colors in URL construction #116

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 5 additions & 3 deletions static/scripts/ocap.marker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ class Marker {
this._typeLower = type.toLowerCase();
this._text = text;
this._player = player; // Entity obj
this._color = `#${color}`; // 00FF00 (hex color)
// Strip # prefix if present (old extension sends colors with #, new without)
const colorHex = color.replace(/^#/, '');
this._color = `#${colorHex}`; // hex color for CSS
this._startFrame = startFrame; // 22
this._endFrame = endFrame; // 35
this._side = side; // -1,0,1,2 (int, pairs to global array)
Expand Down Expand Up @@ -41,12 +43,12 @@ class Marker {
if (this._type.search("magIcons") > -1) {
this._icon = L.icon({ iconSize: [35, 35], iconUrl: `images/markers/${this._typeLower}.png` });
} else if (!this._shape || !this._size) {
this._icon = L.icon({ iconSize: [35, 35], iconUrl: `images/markers/${type}/${color}.png` });
this._icon = L.icon({ iconSize: [35, 35], iconUrl: `images/markers/${type}/${colorHex}.png` });
} else if (this._shape == "ICON") {
this._size = this._size.map(value => {
return (value * 35);
});
this._icon = L.icon({ iconSize: this._size, iconUrl: `images/markers/${type}/${color}.png` });
this._icon = L.icon({ iconSize: this._size, iconUrl: `images/markers/${type}/${colorHex}.png` });
} else {
this._icon = null;
}
Expand Down
Loading