midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix share button

Browse source
This commit is contained in:
Pieter Vander Vennet 2020-11-23 12:54:10 +01:00
parent 02ce4e5d7e
commit 4d2e8b6f24
4 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
InitUiElements.ts
View file

@ -85,11 +85,6 @@ export class InitUiElements {
throw "Incorrect layout" throw "Incorrect layout"
} }
const hashContent = QueryParameters.GetQueryParameter("hash_content", "", "A workaround for the share-api which doesn't share the hash...");
if((hashContent.data ?? "") !== ""){
window.location.hash = hashContent.data;
}
console.log("Using layout: ", layoutToUse.id, "LayoutFromBase64 is ", layoutFromBase64); console.log("Using layout: ", layoutToUse.id, "LayoutFromBase64 is ", layoutFromBase64);
State.state = new State(layoutToUse); State.state = new State(layoutToUse);

2
State.ts
View file

@ -23,7 +23,7 @@ export default class State {
// The singleton of the global state // The singleton of the global state
public static state: State; public static state: State;
public static vNumber = "0.2.2a"; public static vNumber = "0.2.2c";
// The user journey states thresholds when a new feature gets unlocked // The user journey states thresholds when a new feature gets unlocked
public static userJourney = { public static userJourney = {

4
UI/ShareButton.ts
View file

@ -12,9 +12,6 @@ export default class ShareButton extends UIElement{
super(); super();
this._embedded = embedded; this._embedded = embedded;
this._shareData = shareData; this._shareData = shareData;
if(this._shareData.url.indexOf("#")> 0){
this._shareData.url = this._shareData.url.replace("#","&hash_content=");
}
} }
InnerRender(): string { InnerRender(): string {
@ -25,6 +22,7 @@ export default class ShareButton extends UIElement{
super.InnerUpdate(htmlElement); super.InnerUpdate(htmlElement);
const self= this; const self= this;
htmlElement.addEventListener('click', () => { htmlElement.addEventListener('click', () => {
alert("URL:" + self._shareData.url)
if (navigator.share) { if (navigator.share) {
navigator.share(self._shareData).then(() => { navigator.share(self._shareData).then(() => {
console.log('Thanks for sharing!'); console.log('Thanks for sharing!');

20
UI/SpecialVisualizations.ts
View file

@ -197,19 +197,23 @@ export default class SpecialVisualizations {
} }
], ],
constr: (tagSource: UIEventSource<any>, args) => { constr: (tagSource: UIEventSource<any>, args) => {
if (window.navigator.share) { if (window.navigator.share || true) {
const title = State.state.layoutToUse.data.title.txt; const title = State.state.layoutToUse.data.title.txt;
let name = tagSource.data.name; let name = tagSource.data.name;
if(name){ if (name) {
name = `${name} (${title})` name = `${name} (${title})`
}else{ } else {
name = title; name = title;
} }
return new ShareButton(Svg.share_svg(), { let url = args[0] ?? ""
title: name, if (url === "") {
url: args[0] ?? window.location.href, url = window.location.href
text: State.state.layoutToUse.data.shortDescription.txt }
}) return new ShareButton(Svg.share_svg(), {
title: name,
url: url,
text: State.state.layoutToUse.data.shortDescription.txt
})
} else { } else {
return new FixedUiElement("") return new FixedUiElement("")
} }