mirrors/PairDrop
1
0
Fork 0
mirror of https://github.com/schlagmichdoch/PairDrop.git synced 2025-04-21 07:16:18 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace javascript operators ?? and ?. to support older browsers (see #79)

Browse source
This commit is contained in:
schlagmichdoch 2023-03-13 14:21:26 +01:00
parent 5a290718b6
commit 4e0fb89720
4 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/scripts/network.js
View file

@ -390,7 +390,7 @@ class Peer {
} }
_onFilesHeader(header) { _onFilesHeader(header) {
if (this._requestAccepted?.header.length) { if (this._requestAccepted && this._requestAccepted.header.length) {
this._lastProgress = 0; this._lastProgress = 0;
this._digester = new FileDigester({size: header.size, name: header.name, mime: header.mime}, this._digester = new FileDigester({size: header.size, name: header.name, mime: header.mime},
this._requestAccepted.totalSize, this._requestAccepted.totalSize,

13
public/scripts/ui.js
View file

@ -107,8 +107,15 @@ class PeersUI {
_getSavedDisplayName() { _getSavedDisplayName() {
return new Promise((resolve) => { return new Promise((resolve) => {
PersistentStorage.get('editedDisplayName') PersistentStorage.get('editedDisplayName')
.then(displayName => resolve(displayName ?? "")) .then(displayName => {
.catch(_ => resolve(localStorage.getItem('editedDisplayName') ?? "")) if (!displayName) displayName = "";
resolve(displayName);
})
.catch(_ => {
let displayName = localStorage.getItem('editedDisplayName');
if (!displayName) displayName = "";
resolve(displayName);
})
}); });
} }
@ -825,7 +832,7 @@ class ReceiveRequestDialog extends ReceiveDialog {
const connectionHash = $(peerId).ui._connectionHash; const connectionHash = $(peerId).ui._connectionHash;
this._parseFileData(displayName, connectionHash, request.header, request.imagesOnly, request.totalSize); this._parseFileData(displayName, connectionHash, request.header, request.imagesOnly, request.totalSize);
if (request.thumbnailDataUrl?.substring(0, 22) === "data:image/jpeg;base64") { if (request.thumbnailDataUrl && request.thumbnailDataUrl.substring(0, 22) === "data:image/jpeg;base64") {
let element = document.createElement('img'); let element = document.createElement('img');
element.src = request.thumbnailDataUrl; element.src = request.thumbnailDataUrl;
this.$previewBox.appendChild(element) this.$previewBox.appendChild(element)

2
public_included_ws_fallback/scripts/network.js
View file

@ -401,7 +401,7 @@ class Peer {
} }
_onFilesHeader(header) { _onFilesHeader(header) {
if (this._requestAccepted?.header.length) { if (this._requestAccepted && this._requestAccepted.header.length) {
this._lastProgress = 0; this._lastProgress = 0;
this._digester = new FileDigester({size: header.size, name: header.name, mime: header.mime}, this._digester = new FileDigester({size: header.size, name: header.name, mime: header.mime},
this._requestAccepted.totalSize, this._requestAccepted.totalSize,

13
public_included_ws_fallback/scripts/ui.js
View file

@ -107,8 +107,15 @@ class PeersUI {
_getSavedDisplayName() { _getSavedDisplayName() {
return new Promise((resolve) => { return new Promise((resolve) => {
PersistentStorage.get('editedDisplayName') PersistentStorage.get('editedDisplayName')
.then(displayName => resolve(displayName ?? "")) .then(displayName => {
.catch(_ => resolve(localStorage.getItem('editedDisplayName') ?? "")) if (!displayName) displayName = "";
resolve(displayName);
})
.catch(_ => {
let displayName = localStorage.getItem('editedDisplayName');
if (!displayName) displayName = "";
resolve(displayName);
})
}); });
} }
@ -826,7 +833,7 @@ class ReceiveRequestDialog extends ReceiveDialog {
const connectionHash = $(peerId).ui._connectionHash; const connectionHash = $(peerId).ui._connectionHash;
this._parseFileData(displayName, connectionHash, request.header, request.imagesOnly, request.totalSize); this._parseFileData(displayName, connectionHash, request.header, request.imagesOnly, request.totalSize);
if (request.thumbnailDataUrl?.substring(0, 22) === "data:image/jpeg;base64") { if (request.thumbnailDataUrl && request.thumbnailDataUrl.substring(0, 22) === "data:image/jpeg;base64") {
let element = document.createElement('img'); let element = document.createElement('img');
element.src = request.thumbnailDataUrl; element.src = request.thumbnailDataUrl;
this.$previewBox.appendChild(element) this.$previewBox.appendChild(element)