Skip to content

Commit 22b6878

Browse files
ManeraKaiManeraKai
committed
Fixed maps. RTL to default instances checklist. Unify not working in chrmoium
1 parent 8c1b550 commit 22b6878

File tree

4 files changed

+67
-51
lines changed

4 files changed

+67
-51
lines changed

‎src/assets/javascripts/maps.js‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,8 @@ function redirect(url, initiator) {
127127
prefs.marker = coords;
128128
prefs.layer = "mapnik";
129129
let prefsEncoded = new URLSearchParams(prefs).toString();
130-
if (mapsFrontend == 'osm') { resolve(`${randomInstance}/export/embed.html?${prefsEncoded}`); return; }
131-
132-
if (mapsFrontend == 'facil') { resolve(`${randomInstance}/#q=${query}`); return; }
130+
if (mapsFrontend == 'osm') return `${randomInstance}/export/embed.html?${prefsEncoded}`;
131+
if (mapsFrontend == 'facil') return `${randomInstance}/#q=${query}`;
133132

134133
} else if (url.pathname.includes("/dir")) { // Handle Google Maps Directions
135134
// https://www.google.com/maps/dir/?api=1&origin=Space+Needle+Seattle+WA&destination=Pike+Place+Market+Seattle+WA&travelmode=bicycling
@@ -145,34 +144,34 @@ function redirect(url, initiator) {
145144
prefs.route = `${org};${dest}`;
146145

147146
let prefsEncoded = new URLSearchParams(prefs).toString();
148-
if (mapsFrontend == 'osm') { resolve(`${randomInstance}/directions?${prefsEncoded}${mapCentre}`); return; }
149-
if (mapsFrontend == 'facil') { resolve(`${randomInstance}/#q=${orgVal}%20to%20${destVal}%20by%20${travelModesFacil[travMod]}`); return; }
147+
if (mapsFrontend == 'osm') return `${randomInstance}/directions?${prefsEncoded}${mapCentre}`;
148+
if (mapsFrontend == 'facil') return `${randomInstance}/#q=${orgVal}%20to%20${destVal}%20by%20${travelModesFacil[travMod]}`;
150149

151150
} else if (url.pathname.includes("data=") && url.pathname.match(dataLatLngRegex)) { // Get marker from data attribute
152151
// https://www.google.com/maps/place/41%C2%B001'58.2%22N+40%C2%B029'18.2%22E/@41.032833,40.4862063,17z/data=!3m1!4b1!4m6!3m5!1s0x0:0xf64286eaf72fc49d!7e2!8m2!3d41.0328329!4d40.4883948
153152
console.log("data life");
154153

155154
let [, mlat, mlon] = url.pathname.match(dataLatLngRegex);
156155

157-
if (mapsFrontend == 'osm') { resolve(`${randomInstance}/search?query=${mlat}%2C${mlon}`); return; }
158-
if (mapsFrontend == 'facil') { resolve(`${randomInstance}/#q=${mlat}%2C${mlon}`); return; }
156+
if (mapsFrontend == 'osm') return `${randomInstance}/search?query=${mlat}%2C${mlon}`;
157+
if (mapsFrontend == 'facil') return `${randomInstance}/#q=${mlat}%2C${mlon}`;
159158

160159
} else if (url.searchParams.has("ll")) { // Get marker from ll param
161160
// https://maps.google.com/?ll=38.882147,-76.99017
162161
console.log("ll life");
163162

164163
const [mlat, mlon] = url.searchParams.get("ll").split(",");
165164

166-
if (mapsFrontend == 'osm') { resolve(`${randomInstance}/search?query=${mlat}%2C${mlon}`); return; }
167-
if (mapsFrontend == 'facil') { resolve(`${randomInstance}/#q=${mlat}%2C${mlon}`); return; }
165+
if (mapsFrontend == 'osm') return `${randomInstance}/search?query=${mlat}%2C${mlon}`;
166+
if (mapsFrontend == 'facil') return `${randomInstance}/#q=${mlat}%2C${mlon}`
168167
} else if (url.searchParams.has("viewpoint")) { // Get marker from viewpoint param.
169168
// https://www.google.com/maps/@?api=1&map_action=pano&viewpoint=48.857832,2.295226&heading=-45&pitch=38&fov=80
170169
console.log("viewpoint life");
171170

172171
const [mlat, mlon] = url.searchParams.get("viewpoint").split(",");
173172

174-
if (mapsFrontend == 'osm') { resolve(`${randomInstance}/search?query=${mlat}%2C${mlon}`); return; }
175-
if (mapsFrontend == 'facil') { resolve(`${randomInstance}/#q=${mlat}%2C${mlon}`); return; }
173+
if (mapsFrontend == 'osm') return `${randomInstance}/search?query=${mlat}%2C${mlon}`;
174+
if (mapsFrontend == 'facil') return `${randomInstance}/#q=${mlat}%2C${mlon}`;
176175
} else { // Use query as search if present.
177176
console.log("normal life");
178177

@@ -183,17 +182,17 @@ function redirect(url, initiator) {
183182

184183
let prefsEncoded = new URLSearchParams(prefs).toString();
185184
if (query) {
186-
if (mapsFrontend == 'osm') { resolve(`${randomInstance}/search?query="${query}${mapCentre}&${prefsEncoded}`); return; }
187-
if (mapsFrontend == 'facil') { resolve(`${randomInstance}/${mapCentre}/Mpnk/${query}`); return; }
185+
if (mapsFrontend == 'osm') return `${randomInstance}/search?query="${query}${mapCentre}&${prefsEncoded}`;
186+
if (mapsFrontend == 'facil') return `${randomInstance}/${mapCentre}/Mpnk/${query}`;
188187
}
189188
}
190189

191190
let prefsEncoded = new URLSearchParams(prefs).toString();
192191
console.log("mapCentre", mapCentre);
193192
console.log("prefs", prefs);
194193
console.log("prefsEncoded", prefsEncoded);
195-
if (mapsFrontend == 'osm') { resolve(`${randomInstance}/${mapCentre}&${prefsEncoded}`); return; }
196-
if (mapsFrontend == 'facil') { resolve(`${randomInstance}/${mapCentre}/Mpnk`); return; }
194+
if (mapsFrontend == 'osm') return `${randomInstance}/${mapCentre}&${prefsEncoded}`;
195+
if (mapsFrontend == 'facil') return `${randomInstance}/${mapCentre}/Mpnk`;
197196
}
198197

199198
async function initDefaults() {

‎src/assets/javascripts/utils.js‎

Lines changed: 48 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -286,36 +286,50 @@ async function testLatency(element, instances) {
286286

287287
function copyCookie(frontend, targetUrl, urls, name) {
288288
return new Promise(resolve => {
289+
let query;
290+
if (window.chrome) query = { url: protocolHost(targetUrl), name: name }
291+
else query = { url: protocolHost(targetUrl), name: name, firstPartyDomain: null }
289292
browser.cookies.getAll(
290-
{ url: protocolHost(targetUrl), name: name, firstPartyDomain: null },
291-
cookies => {
292-
browser.privacy.websites.firstPartyIsolate.get({},
293-
async firstPartyIsolate => {
294-
function setCookie(url, name, value, expirationDate) {
295-
return new Promise(resolve =>
296-
browser.cookies.set(
297-
{
298-
url: url,
299-
name: name,
300-
value: value,
301-
secure: true,
302-
firstPartyDomain: firstPartyIsolate.value ? new URL(url).hostname : '',
303-
expirationDate: firstPartyIsolate.value ? null : expirationDate,
304-
},
305-
() => resolve()
306-
)
307-
)
293+
query,
294+
async cookies => {
295+
function setCookie(url, name, value, expirationDate, firstPartyIsolate) {
296+
return new Promise(resolve => {
297+
let query;
298+
if (window.chrome) query = {
299+
url: url, name: name, value: value, secure: true,
300+
expirationDate: expirationDate,
301+
};
302+
else query = {
303+
url: url, name: name, value: value, secure: true,
304+
firstPartyDomain: firstPartyIsolate.value ? new URL(url).hostname : '',
305+
expirationDate: firstPartyIsolate.value ? null : expirationDate,
306+
};
307+
browser.cookies.set(query, () => resolve())
308+
})
309+
}
310+
if (window.chrome) {
311+
for (const cookie of cookies)
312+
if (cookie.name == name) {
313+
console.log('cookie', cookie);
314+
for (const url of urls) await setCookie(url, cookie.name, cookie.value, cookie.expirationDate)
315+
browser.storage.local.set({ [`${frontend}_${name}`]: cookie }, () => resolve())
316+
break;
308317
}
309-
for (const cookie of cookies)
310-
if (cookie.name == name) {
311-
console.log('cookie', cookie);
312-
for (const url of urls) await setCookie(url, cookie.name, cookie.value, cookie.expirationDate)
313-
browser.storage.local.set({ [`${frontend}_${name}`]: cookie }, () => resolve())
314-
break;
315-
}
316-
resolve();
317-
}
318-
)
318+
resolve();
319+
} else {
320+
browser.privacy.websites.firstPartyIsolate.get({},
321+
async firstPartyIsolate => {
322+
for (const cookie of cookies)
323+
if (cookie.name == name) {
324+
console.log('cookie', cookie);
325+
for (const url of urls) await setCookie(url, cookie.name, cookie.value, cookie.expirationDate, firstPartyIsolate)
326+
browser.storage.local.set({ [`${frontend}_${name}`]: cookie }, () => resolve())
327+
break;
328+
}
329+
resolve();
330+
}
331+
)
332+
}
319333
});
320334
})
321335
}
@@ -363,14 +377,18 @@ function copyRaw(test, copyRawElement) {
363377
resolve(true);
364378
if (test) return;
365379
navigator.clipboard.writeText(newUrl);
380+
console.log('newUrl', newUrl)
366381
if (copyRawElement) {
382+
console.log('working')
367383
const textElement = copyRawElement.getElementsByTagName('h4')[0]
368384
const oldHtml = textElement.innerHTML;
369385
textElement.innerHTML = browser.i18n.getMessage('copied');
370386
setTimeout(() => textElement.innerHTML = oldHtml, 1000);
371387
}
372-
} else resolve()
388+
console.log('finished')
389+
}
373390
}
391+
resolve()
374392
}
375393
)
376394
})
@@ -406,9 +424,7 @@ function unify(test) {
406424
if (!result) result = await translateHelper.copyPasteSimplyTranslateCookies(test, url);
407425
if (!result) result = await translateHelper.copyPasteLingvaLocalStorage(test, url);
408426

409-
if (result) {
410-
resolve(true);
411-
} else resolve()
427+
resolve(result);
412428
}
413429
}
414430
)

‎src/pages/background/background.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ browser.runtime.onInstalled.addListener(
6969
)
7070

7171
youtubeHelper.pasteInvidiousCookies();
72-
youtubeHelper.pastePipedLocalStorage();
73-
youtubeHelper.pastePipedMaterialLocalStorage();
7472
translateHelper.pasteSimplyTranslateCookies();
75-
translateHelper.pasteLingvaLocalStorage();
7673
twitterHelper.pasteNitterCookies();
7774
wikipediaHelper.pasteWikilessCookies();
7875
searchHelper.pasteSearxCookies();
@@ -215,7 +212,7 @@ browser.webRequest.onErrorOccurred.addListener(
215212
)
216213

217214
browser.commands.onCommand.addListener(
218-
command => {
215+
async command => {
219216
if (command === 'switchInstance') utils.switchInstance();
220217
else if (command == 'copyRaw') utils.copyRaw();
221218
else if (command == 'unify') utils.unify();

‎src/pages/stylesheets/styles.css‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,10 @@ button svg {
341341
color: var(--text);
342342
}
343343

344+
div.checklist{
345+
direction: ltr;
346+
}
347+
344348
div.checklist div {
345349
justify-content: space-between;
346350
margin: 5px 15px;

0 commit comments

Comments
 (0)