From cf55117a613586d7d877c8faebf2566352fb37e7 Mon Sep 17 00:00:00 2001 From: schlagmichdoch Date: Wed, 8 Nov 2023 20:36:46 +0100 Subject: [PATCH] tidy up code and conform use of setAttribute/removeAttribute --- public/index.html | 2 +- public/scripts/network.js | 10 +++++---- public/scripts/ui.js | 46 +++++++++++++++++++-------------------- 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/public/index.html b/public/index.html index 671c4c9..b658712 100644 --- a/public/index.html +++ b/public/index.html @@ -15,7 +15,7 @@ - + diff --git a/public/scripts/network.js b/public/scripts/network.js index 6a8faed..53c2c67 100644 --- a/public/scripts/network.js +++ b/public/scripts/network.js @@ -782,7 +782,8 @@ class RTCPeer extends Peer { channel.onopen = e => this._onChannelOpened(e); channel.onerror = e => this._onError(e); - this._conn.createOffer() + this._conn + .createOffer() .then(d => this._onDescription(d)) .catch(e => this._onError(e)); } @@ -1133,7 +1134,8 @@ class PeersManager { // If no peers are connected anymore, we can safely assume that no other tab on the same browser is connected: // Tidy up peerIds in localStorage if (Object.keys(this.peers).length === 0) { - BrowserTabsConnector.removeOtherPeerIdsFromLocalStorage() + BrowserTabsConnector + .removeOtherPeerIdsFromLocalStorage() .then(peerIds => { if (!peerIds) return; console.log("successfully removed other peerIds from localStorage"); @@ -1349,11 +1351,11 @@ class Events { window.dispatchEvent(new CustomEvent(type, { detail: detail })); } - static on(type, callback, options = false) { + static on(type, callback, options) { return window.addEventListener(type, callback, options); } - static off(type, callback, options = false) { + static off(type, callback, options) { return window.removeEventListener(type, callback, options); } } diff --git a/public/scripts/ui.js b/public/scripts/ui.js index c4ca107..d331298 100644 --- a/public/scripts/ui.js +++ b/public/scripts/ui.js @@ -43,7 +43,7 @@ class PeersUI { this.$cancelPasteModeBtn.addEventListener('click', _ => this._cancelPasteMode()); // Show "Loading…" - this.$displayName.setAttribute("placeholder", this.$displayName.dataset.placeholder); + this.$displayName.setAttribute('placeholder', this.$displayName.dataset.placeholder); this.$displayName.addEventListener('keydown', e => this._onKeyDownDisplayName(e)); this.$displayName.addEventListener('keyup', e => this._onKeyUpDisplayName(e)); @@ -310,12 +310,12 @@ class PeersUI { _onDragOver(e) { e.preventDefault(); - this.$xInstructions.setAttribute('drop-bg', 1); - this.$xNoPeers.setAttribute('drop-bg', 1); + this.$xInstructions.setAttribute('drop-bg', true); + this.$xNoPeers.setAttribute('drop-bg', true); } _onDragEnd() { - this.$xInstructions.removeAttribute('drop-bg', 1); + this.$xInstructions.removeAttribute('drop-bg'); this.$xNoPeers.removeAttribute('drop-bg'); } @@ -392,7 +392,7 @@ class PeersUI { this.$xNoPeers.querySelector('h2').innerHTML = Localization.getTranslation("instructions.no-peers-title"); - this.$cancelPasteModeBtn.setAttribute('hidden', ""); + this.$cancelPasteModeBtn.setAttribute('hidden', true); console.log('Paste mode deactivated.') Events.fire('paste-mode-changed', { @@ -649,13 +649,13 @@ class PeerUI { } _onDragOver() { - this.$el.setAttribute('drop', 1); - this.$xInstructions.setAttribute('drop-peer', 1); + this.$el.setAttribute('drop', true); + this.$xInstructions.setAttribute('drop-peer', true); } _onDragEnd() { this.$el.removeAttribute('drop'); - this.$xInstructions.removeAttribute('drop-peer', 1); + this.$xInstructions.removeAttribute('drop-peer'); } _onRightClick(e) { @@ -698,7 +698,7 @@ class Dialog { } show() { - this.$el.setAttribute('show', 1); + this.$el.setAttribute('show', true); if (!window.isMobile && this.$autoFocus) this.$autoFocus.focus(); } @@ -1047,7 +1047,7 @@ class ReceiveFileDialog extends ReceiveDialog { } hide() { - this.$shareBtn.setAttribute('hidden', ''); + this.$shareBtn.setAttribute('hidden', true); this.$previewBox.innerHTML = ''; super.hide(); this._dequeueFile(); @@ -1157,11 +1157,11 @@ class InputKeyContainer { } _enableChars() { - this.$inputKeyChars.forEach(char => char.removeAttribute("disabled")); + this.$inputKeyChars.forEach(char => char.removeAttribute('disabled')); } _disableChars() { - this.$inputKeyChars.forEach(char => char.setAttribute("disabled", "")); + this.$inputKeyChars.forEach(char => char.setAttribute('disabled', true)); } _clearChars() { @@ -1267,8 +1267,8 @@ class PairDeviceDialog extends Dialog { this.inputKeyContainer = new InputKeyContainer( this.$el.querySelector('.input-key-container'), /\d/, - () => this.$pairSubmitBtn.removeAttribute("disabled"), - () => this.$pairSubmitBtn.setAttribute("disabled", ""), + () => this.$pairSubmitBtn.removeAttribute('disabled'), + () => this.$pairSubmitBtn.setAttribute('disabled', true), () => this._submit() ); @@ -1489,8 +1489,8 @@ class PairDeviceDialog extends Dialog { this.$footerInstructionsPairedDevices.removeAttribute('hidden'); } else { - this.$editPairedDevicesHeaderBtn.setAttribute('hidden', ''); - this.$footerInstructionsPairedDevices.setAttribute('hidden', ''); + this.$editPairedDevicesHeaderBtn.setAttribute('hidden', true); + this.$footerInstructionsPairedDevices.setAttribute('hidden', true); } Events.fire('evaluate-footer-badges'); Events.fire('header-evaluated', 'edit-paired-devices'); @@ -1637,8 +1637,8 @@ class PublicRoomDialog extends Dialog { this.inputKeyContainer = new InputKeyContainer( this.$el.querySelector('.input-key-container'), /[a-z|A-Z]/, - () => this.$joinSubmitBtn.removeAttribute("disabled"), - () => this.$joinSubmitBtn.setAttribute("disabled", ""), + () => this.$joinSubmitBtn.removeAttribute('disabled'), + () => this.$joinSubmitBtn.setAttribute('disabled', true), () => this._submit() ); @@ -1843,7 +1843,7 @@ class PublicRoomDialog extends Dialog { this.roomId = null; this.inputKeyContainer._cleanUp(); sessionStorage.removeItem('public_room_id'); - this.$footerBadgePublicRoomDevices.setAttribute('hidden', ''); + this.$footerBadgePublicRoomDevices.setAttribute('hidden', true); Events.fire('evaluate-footer-badges'); } } @@ -1879,7 +1879,7 @@ class SendTextDialog extends Dialog { _onChange() { if (this._textInputEmpty()) { - this.$submit.setAttribute('disabled', ''); + this.$submit.setAttribute('disabled', true); } else { this.$submit.removeAttribute('disabled'); @@ -2086,7 +2086,7 @@ class Base64ZipDialog extends Dialog { } else { console.log("`navigator.clipboard.readText()` is not available on your browser.\nOn Firefox you can set `dom.events.asyncClipboard.readText` to true under `about:config` for convenience.") - this.$pasteBtn.setAttribute('hidden', ''); + this.$pasteBtn.setAttribute('hidden', true); this.$fallbackTextarea.setAttribute('placeholder', Localization.getTranslation("dialogs.base64-paste-to-send", null, {type: translateType})); this.$fallbackTextarea.removeAttribute('hidden'); this._inputCallback = _ => this.processInput(type); @@ -2219,7 +2219,7 @@ class Notifications { return; } Events.fire('notify-user', Localization.getTranslation("notifications.notifications-enabled")); - this.$headerNotificationButton.setAttribute('hidden', ""); + this.$headerNotificationButton.setAttribute('hidden', true); }); } @@ -2940,7 +2940,7 @@ window.addEventListener('beforeinstallprompt', installEvent => { const installBtn = document.querySelector('#install') installBtn.removeAttribute('hidden'); installBtn.addEventListener('click', () => { - installBtn.setAttribute('hidden', ''); + installBtn.setAttribute('hidden', true); installEvent.prompt(); }); }