MirrorMirror
/
PairDrop
mirror of https://github.com/schlagmichdoch/PairDrop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #349 from schlagmichdoch/fix-ios15.3 

Add support for iOS <15.3
This commit is contained in:
schlagmichdoch 2025-02-13 12:02:14 +01:00 committed by GitHub
parent c52eeda3ff f7fe303fa7
commit 94096aa13c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/browser-tabs-connector.js
View File

@ -1,5 +1,7 @@
class BrowserTabsConnector { class BrowserTabsConnector {
constructor() { constructor() {
if (!('BroadcastChannel' in window)) return;
this.bc = new BroadcastChannel('pairdrop'); this.bc = new BroadcastChannel('pairdrop');
this.bc.addEventListener('message', e => this._onMessage(e)); this.bc.addEventListener('message', e => this._onMessage(e));
Events.on('broadcast-send', e => this._broadcastSend(e.detail)); Events.on('broadcast-send', e => this._broadcastSend(e.detail));

39
public/scripts/ui.js
View File

@ -18,11 +18,12 @@ class PeersUI {
this.peers = {}; this.peers = {};
this.shareMode = {}; this.shareMode = {
this.shareMode.active = false; active: false,
this.shareMode.descriptor = ""; descriptor: "",
this.shareMode.files = []; files: [],
this.shareMode.text = ""; text: ""
}
Events.on('peer-joined', e => this._onPeerJoined(e.detail)); Events.on('peer-joined', e => this._onPeerJoined(e.detail));
Events.on('peer-added', _ => this._evaluateOverflowingPeers()); Events.on('peer-added', _ => this._evaluateOverflowingPeers());
@ -394,12 +395,6 @@ class PeersUI {
class PeerUI { class PeerUI {
static _badgeClassNames = ["badge-room-ip", "badge-room-secret", "badge-room-public-id"];
static _shareMode = {
active: false,
descriptor: ""
};
constructor(peer, connectionHash, shareMode) { constructor(peer, connectionHash, shareMode) {
this.$xInstructions = $$('x-instructions'); this.$xInstructions = $$('x-instructions');
this.$xPeers = $$('x-peers'); this.$xPeers = $$('x-peers');
@ -409,7 +404,7 @@ class PeerUI {
`${connectionHash.substring(0, 4)} ${connectionHash.substring(4, 8)} ${connectionHash.substring(8, 12)} ${connectionHash.substring(12, 16)}`; `${connectionHash.substring(0, 4)} ${connectionHash.substring(4, 8)} ${connectionHash.substring(8, 12)} ${connectionHash.substring(12, 16)}`;
// This is needed if the ShareMode is started BEFORE the PeerUI is drawn. // This is needed if the ShareMode is started BEFORE the PeerUI is drawn.
PeerUI._shareMode = shareMode; this._shareMode = shareMode;
this._initDom(); this._initDom();
@ -421,8 +416,8 @@ class PeerUI {
} }
html() { html() {
let title= PeerUI._shareMode.active let title= this._shareMode.active
? Localization.getTranslation("peer-ui.click-to-send-share-mode", null, {descriptor: PeerUI._shareMode.descriptor}) ? Localization.getTranslation("peer-ui.click-to-send-share-mode", null, {descriptor: this._shareMode.descriptor})
: Localization.getTranslation("peer-ui.click-to-send"); : Localization.getTranslation("peer-ui.click-to-send");
this.$el.innerHTML = ` this.$el.innerHTML = `
@ -485,8 +480,8 @@ class PeerUI {
_onShareModeChanged(active = false, descriptor = "") { _onShareModeChanged(active = false, descriptor = "") {
// This is needed if the ShareMode is started AFTER the PeerUI is drawn. // This is needed if the ShareMode is started AFTER the PeerUI is drawn.
PeerUI._shareMode.active = active; this._shareMode.active = active;
PeerUI._shareMode.descriptor = descriptor; this._shareMode.descriptor = descriptor;
this._evaluateShareMode(); this._evaluateShareMode();
this._bindListeners(); this._bindListeners();
@ -494,12 +489,12 @@ class PeerUI {
_evaluateShareMode() { _evaluateShareMode() {
let title; let title;
if (!PeerUI._shareMode.active) { if (!this._shareMode.active) {
title = Localization.getTranslation("peer-ui.click-to-send"); title = Localization.getTranslation("peer-ui.click-to-send");
this.$input.removeAttribute('disabled'); this.$input.removeAttribute('disabled');
} }
else { else {
title = Localization.getTranslation("peer-ui.click-to-send-share-mode", null, {descriptor: PeerUI._shareMode.descriptor}); title = Localization.getTranslation("peer-ui.click-to-send-share-mode", null, {descriptor: this._shareMode.descriptor});
this.$input.setAttribute('disabled', true); this.$input.setAttribute('disabled', true);
} }
this.$label.setAttribute('title', title); this.$label.setAttribute('title', title);
@ -520,7 +515,7 @@ class PeerUI {
} }
_bindListeners() { _bindListeners() {
if(!PeerUI._shareMode.active) { if(!this._shareMode.active) {
// Remove Events Share mode // Remove Events Share mode
this.$el.removeEventListener('pointerdown', this._callbackPointerDown); this.$el.removeEventListener('pointerdown', this._callbackPointerDown);
@ -636,7 +631,7 @@ class PeerUI {
} }
_onDrop(e) { _onDrop(e) {
if (PeerUI._shareMode.active || Dialog.anyDialogShown()) return; if (this._shareMode.active || Dialog.anyDialogShown()) return;
e.preventDefault(); e.preventDefault();
@ -1974,7 +1969,7 @@ class SendTextDialog extends Dialog {
_onRecipient(peerId, deviceName) { _onRecipient(peerId, deviceName) {
this.correspondingPeerId = peerId; this.correspondingPeerId = peerId;
this.$peerDisplayName.innerText = deviceName; this.$peerDisplayName.innerText = deviceName;
this.$peerDisplayName.classList.remove(...PeerUI._badgeClassNames); this.$peerDisplayName.classList.remove("badge-room-ip", "badge-room-secret", "badge-room-public-id");
this.$peerDisplayName.classList.add($(peerId).ui._badgeClassName()); this.$peerDisplayName.classList.add($(peerId).ui._badgeClassName());
this.show(); this.show();
@ -2056,7 +2051,7 @@ class ReceiveTextDialog extends Dialog {
_showReceiveTextDialog(text, peerId) { _showReceiveTextDialog(text, peerId) {
this.$displayName.innerText = $(peerId).ui._displayName(); this.$displayName.innerText = $(peerId).ui._displayName();
this.$displayName.classList.remove(...PeerUI._badgeClassNames); this.$displayName.classList.remove("badge-room-ip", "badge-room-secret", "badge-room-public-id");
this.$displayName.classList.add($(peerId).ui._badgeClassName()); this.$displayName.classList.add($(peerId).ui._badgeClassName());
this.$text.innerText = text; this.$text.innerText = text;

5
public/styles/styles-main.css
View File

@ -696,7 +696,6 @@ button::-moz-focus-inner {
/* Info Animation */ /* Info Animation */
#about { #about {
color: white; color: white;
z-index: 32; z-index: 32;
@ -752,9 +751,11 @@ button::-moz-focus-inner {
height: var(--size); height: var(--size);
z-index: -1; z-index: -1;
background: var(--primary-color); background: var(--primary-color);
background-image: radial-gradient(circle at calc(50% - 36px), var(--accent-color) 0%, color-mix(in srgb, var(--accent-color) 40%, black) 80%); background-image: radial-gradient(circle at calc(50% - 36px), var(--primary-color) 0%, black 80%);
--crop-size: 0px; --crop-size: 0px;
clip-path: circle(var(--crop-size)); clip-path: circle(var(--crop-size));
/* For clients < iOS 13.1 */
-webkit-clip-path: circle(var(--crop-size));
} }
html:not([dir="rtl"]) #about x-background { html:not([dir="rtl"]) #about x-background {