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

Merge branch 'master' into translate

Browse source
This commit is contained in:
schlagmichdoch 2023-12-13 17:33:09 +01:00
commit 16921cb855
12 changed files with 131 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/scripts/main.js
View file

@ -7,7 +7,7 @@ class PairDrop {
this.$headerInstallBtn = $('install');
this.deferredStyles = [
"styles/deferred-styles.css"
"styles/styles-deferred.css"
];
this.deferredScripts = [
"scripts/browser-tabs-connector.js",

8
public/scripts/ui-main.js
View file

@ -125,9 +125,12 @@ class HeaderUI {
}
async evaluateOverflowing() {
// remove and reset bracket icon before evaluating
// remove bracket icon before evaluating
this.$expandBtn.setAttribute('hidden', true);
// reset bracket icon rotation and header overflow
this.$expandBtn.classList.add('flipped');
this.$header.classList.remove('overflow-expanded');
const rtlLocale = Localization.isCurrentLocaleRtl();
let icon;
@ -152,7 +155,7 @@ class HeaderUI {
}
else {
// no overflowing
// add overflowing-hidden class
// remove overflowing-hidden class
this.$header.classList.remove('overflow-hidden');
}
}
@ -169,6 +172,7 @@ class HeaderUI {
this.$header.classList.remove('overflow-expanded');
this.$expandBtn.classList.add('flipped');
}
Events.fire('header-changed');
}
}

27
public/scripts/ui.js
View file

@ -37,6 +37,7 @@ class PeersUI {
Events.on('dragleave', _ => this._onDragEnd());
Events.on('dragend', _ => this._onDragEnd());
Events.on('resize', _ => this._evaluateOverflowingPeers());
Events.on('header-changed', _ => this._evaluateOverflowingPeers());
Events.on('paste', e => this._onPaste(e));
Events.on('activate-share-mode', e => this._activateShareMode(e.detail.files, e.detail.text));
@ -277,22 +278,10 @@ class PeersUI {
if (files[0].type.split('/')[0] === 'image') {
try {
let image = files[0]
let imageUrl = await getThumbnailAsDataUrl(files[0], 80, null, 0.9);
// Heic files can't be shown by browsers natively --> convert to jpeg
if (image.type === "image/heif" || image.type === "image/heic") {
let blob = await fileToBlob(image);
image = await heic2any({
blob,
toType: "image/jpeg",
quality: 0.9
});
}
let imageUrl = URL.createObjectURL(image);
this.$shareModeImageThumb.style.backgroundImage = `url(${imageUrl})`;
await waitUntilImageIsLoaded(imageUrl);
this.$shareModeImageThumb.removeAttribute('hidden');
} catch (e) {
console.error(e);
@ -740,7 +729,7 @@ class Dialog {
hide() {
this.$el.removeAttribute('show');
if (!window.isMobile && this.$autoFocus) {
if (!window.isMobile) {
document.activeElement.blur();
window.blur();
}
@ -1586,7 +1575,7 @@ class EditPairedDevicesDialog extends Dialog {
<span class="center wrap">
${autoAcceptString}
</span>
<label class="auto-accept switch pointer m1">
<label class="auto-accept switch pointer m-1">
<input type="checkbox" ${roomSecretsEntry.auto_accept ? "checked" : ""}>
<div class="slider round"></div>
</label>
@ -2164,13 +2153,13 @@ class Base64Dialog extends Dialog {
// ?base64text=hash#BASE64ENCODED
// base64 encoded text is url hash which cannot be seen by the server and is faster (recommended)
this.show();
await this.processBase64Text(hash)
await this.processBase64Text(hash);
}
else {
// ?base64text=BASE64ENCODED
// base64 encoded text is part of the url param. Seen by server and slow (not recommended)
this.show();
await this.processBase64Text(base64Text)
await this.processBase64Text(base64Text);
}
}
@ -2185,7 +2174,7 @@ class Base64Dialog extends Dialog {
else if (base64Zip === 'hash') {
// ?base64zip=hash#BASE64ENCODED
// base64 encoded zip file is url hash which cannot be seen by the server
await this.processBase64Zip(hash)
await this.processBase64Zip(hash);
}
}
@ -2280,6 +2269,8 @@ class Base64Dialog extends Dialog {
hide() {
this.$pasteBtn.removeEventListener('click', _ => this._clickCallback());
this.$fallbackTextarea.removeEventListener('input', _ => this._inputCallback());
this.$fallbackTextarea.setAttribute('disabled', true);
this.$fallbackTextarea.blur();
super.hide();
}
}