Tidy up Javascript files

This commit is contained in:
schlagmichdoch 2023-10-31 19:08:20 +01:00
parent cb8d6448f5
commit d84c7d1f84
8 changed files with 56 additions and 28 deletions

View file

@ -584,11 +584,11 @@
</svg> </svg>
<!-- Scripts --> <!-- Scripts -->
<script src="scripts/util.js"></script>
<script src="scripts/localization.js"></script> <script src="scripts/localization.js"></script>
<script src="scripts/theme.js"></script> <script src="scripts/theme.js"></script>
<script src="scripts/network.js"></script> <script src="scripts/network.js"></script>
<script src="scripts/ui.js"></script> <script src="scripts/ui.js"></script>
<script src="scripts/util.js"></script>
<script src="scripts/QRCode.min.js" async></script> <script src="scripts/QRCode.min.js" async></script>
<script src="scripts/zip.min.js" async></script> <script src="scripts/zip.min.js" async></script>
<script src="scripts/NoSleep.min.js" async></script> <script src="scripts/NoSleep.min.js" async></script>

View file

@ -3,22 +3,32 @@ window.isRtcSupported = !!(window.RTCPeerConnection || window.mozRTCPeerConnecti
if (!window.isRtcSupported) alert("WebRTC must be enabled for PairDrop to work"); if (!window.isRtcSupported) alert("WebRTC must be enabled for PairDrop to work");
window.hiddenProperty = 'hidden' in document ? 'hidden' : window.hiddenProperty = 'hidden' in document
'webkitHidden' in document ? 'webkitHidden' : ? 'hidden'
'mozHidden' in document ? 'mozHidden' : : 'webkitHidden' in document
null; ? 'webkitHidden'
window.visibilityChangeEvent = 'visibilitychange' in document ? 'visibilitychange' : : 'mozHidden' in document
'webkitvisibilitychange' in document ? 'webkitvisibilitychange' : ? 'mozHidden'
'mozvisibilitychange' in document ? 'mozvisibilitychange' : : null;
null;
window.visibilityChangeEvent = 'visibilitychange' in document
? 'visibilitychange'
: 'webkitvisibilitychange' in document
? 'webkitvisibilitychange'
: 'mozvisibilitychange' in document
? 'mozvisibilitychange'
: null;
class ServerConnection { class ServerConnection {
constructor() { constructor() {
this._connect();
Events.on('pagehide', _ => this._disconnect()); Events.on('pagehide', _ => this._disconnect());
document.addEventListener(window.visibilityChangeEvent, _ => this._onVisibilityChange()); Events.on(window.visibilityChangeEvent, _ => this._onVisibilityChange());
if (navigator.connection) navigator.connection.addEventListener('change', _ => this._reconnect());
if (navigator.connection) {
navigator.connection.addEventListener('change', _ => this._reconnect());
}
Events.on('room-secrets', e => this.send({ type: 'room-secrets', roomSecrets: e.detail })); Events.on('room-secrets', e => this.send({ type: 'room-secrets', roomSecrets: e.detail }));
Events.on('join-ip-room', e => this.send({ type: 'join-ip-room'})); Events.on('join-ip-room', e => this.send({ type: 'join-ip-room'}));
Events.on('room-secrets-deleted', e => this.send({ type: 'room-secrets-deleted', roomSecrets: e.detail})); Events.on('room-secrets-deleted', e => this.send({ type: 'room-secrets-deleted', roomSecrets: e.detail}));
@ -33,6 +43,8 @@ class ServerConnection {
Events.on('offline', _ => clearTimeout(this._reconnectTimer)); Events.on('offline', _ => clearTimeout(this._reconnectTimer));
Events.on('online', _ => this._connect()); Events.on('online', _ => this._connect());
this._connect();
} }
_connect() { _connect() {

View file

@ -1,5 +1,3 @@
const $ = query => document.getElementById(query);
const $$ = query => document.body.querySelector(query);
window.iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; window.iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
window.android = /android/i.test(navigator.userAgent); window.android = /android/i.test(navigator.userAgent);
window.isMobile = window.iOS || window.android; window.isMobile = window.iOS || window.android;

View file

@ -37,6 +37,9 @@ if (!navigator.clipboard) {
} }
} }
const $ = query => document.getElementById(query);
const $$ = query => document.querySelector(query);
const zipper = (() => { const zipper = (() => {
let zipWriter; let zipWriter;

View file

@ -589,11 +589,11 @@
</svg> </svg>
<!-- Scripts --> <!-- Scripts -->
<script src="scripts/util.js"></script>
<script src="scripts/localization.js"></script> <script src="scripts/localization.js"></script>
<script src="scripts/theme.js"></script> <script src="scripts/theme.js"></script>
<script src="scripts/network.js"></script> <script src="scripts/network.js"></script>
<script src="scripts/ui.js"></script> <script src="scripts/ui.js"></script>
<script src="scripts/util.js"></script>
<script src="scripts/QRCode.min.js" async></script> <script src="scripts/QRCode.min.js" async></script>
<script src="scripts/zip.min.js" async></script> <script src="scripts/zip.min.js" async></script>
<script src="scripts/NoSleep.min.js" async></script> <script src="scripts/NoSleep.min.js" async></script>

View file

@ -1,22 +1,34 @@
window.URL = window.URL || window.webkitURL; window.URL = window.URL || window.webkitURL;
window.isRtcSupported = !!(window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection); window.isRtcSupported = !!(window.RTCPeerConnection || window.mozRTCPeerConnection || window.webkitRTCPeerConnection);
window.hiddenProperty = 'hidden' in document ? 'hidden' : if (!window.isRtcSupported) alert("WebRTC must be enabled for PairDrop to work");
'webkitHidden' in document ? 'webkitHidden' :
'mozHidden' in document ? 'mozHidden' : window.hiddenProperty = 'hidden' in document
null; ? 'hidden'
window.visibilityChangeEvent = 'visibilitychange' in document ? 'visibilitychange' : : 'webkitHidden' in document
'webkitvisibilitychange' in document ? 'webkitvisibilitychange' : ? 'webkitHidden'
'mozvisibilitychange' in document ? 'mozvisibilitychange' : : 'mozHidden' in document
null; ? 'mozHidden'
: null;
window.visibilityChangeEvent = 'visibilitychange' in document
? 'visibilitychange'
: 'webkitvisibilitychange' in document
? 'webkitvisibilitychange'
: 'mozvisibilitychange' in document
? 'mozvisibilitychange'
: null;
class ServerConnection { class ServerConnection {
constructor() { constructor() {
this._connect();
Events.on('pagehide', _ => this._disconnect()); Events.on('pagehide', _ => this._disconnect());
document.addEventListener(window.visibilityChangeEvent, _ => this._onVisibilityChange()); Events.on(window.visibilityChangeEvent, _ => this._onVisibilityChange());
if (navigator.connection) navigator.connection.addEventListener('change', _ => this._reconnect());
if (navigator.connection) {
navigator.connection.addEventListener('change', _ => this._reconnect());
}
Events.on('room-secrets', e => this.send({ type: 'room-secrets', roomSecrets: e.detail })); Events.on('room-secrets', e => this.send({ type: 'room-secrets', roomSecrets: e.detail }));
Events.on('join-ip-room', e => this.send({ type: 'join-ip-room'})); Events.on('join-ip-room', e => this.send({ type: 'join-ip-room'}));
Events.on('room-secrets-deleted', e => this.send({ type: 'room-secrets-deleted', roomSecrets: e.detail})); Events.on('room-secrets-deleted', e => this.send({ type: 'room-secrets-deleted', roomSecrets: e.detail}));
@ -31,6 +43,8 @@ class ServerConnection {
Events.on('offline', _ => clearTimeout(this._reconnectTimer)); Events.on('offline', _ => clearTimeout(this._reconnectTimer));
Events.on('online', _ => this._connect()); Events.on('online', _ => this._connect());
this._connect();
} }
_connect() { _connect() {

View file

@ -1,5 +1,3 @@
const $ = query => document.getElementById(query);
const $$ = query => document.body.querySelector(query);
window.iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream; window.iOS = /iPad|iPhone|iPod/.test(navigator.userAgent) && !window.MSStream;
window.android = /android/i.test(navigator.userAgent); window.android = /android/i.test(navigator.userAgent);
window.isMobile = window.iOS || window.android; window.isMobile = window.iOS || window.android;

View file

@ -37,6 +37,9 @@ if (!navigator.clipboard) {
} }
} }
const $ = query => document.getElementById(query);
const $$ = query => document.querySelector(query);
const zipper = (() => { const zipper = (() => {
let zipWriter; let zipWriter;