Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update electron #1052

Merged
merged 6 commits into from
Nov 16, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions package-lock.json

This file was deleted.

26 changes: 0 additions & 26 deletions spot-client/src/common/detection/detection.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,29 +113,3 @@ export function isWirelessScreenshareSupported() {
&& jitsiBrowserDetection.supportsGetDisplayMedia()
&& !jitsiBrowserDetection.isElectron();
}

/**
* Returns whether or not the current environment has a bug where caret-color
* is not respected on the initial focus of a text input element.
*
* @returns {boolean}
*/
export function hasVisibleCaretOnInitialFocus() {
return _hasReactNativeOnlyAttributes()
&& _isIOSWebView()
&& _isMaybeIOS13();
}

/**
* Detects whether or not the current environment is in iOS 13. Starting with
* iOS 13, the user agent may return that it is actually macOS, and bowser does
* not have a workaround for this yet. As such, there is an assumption that
* a mobile platform with a certain macOS version may be 13.
*
* @private
* @returns {boolean}
*/
function _isMaybeIOS13() {
return (browser.getOSName() === 'iOS' && browser.getOSVersion().startsWith('13'))
|| (browser.getPlatformType() === 'mobile' && browser.getOSVersion().startsWith('10.15'));
}
6 changes: 0 additions & 6 deletions spot-client/src/common/ui/components/code-input/CodeInput.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
hasVisibleCaretOnInitialFocus,
isAutoFocusSupported
} from 'common/detection';
import PropTypes from 'prop-types';
Expand Down Expand Up @@ -144,11 +143,6 @@ export default class CodeInput extends React.Component {
*/
_onRootClick() {
if (!this.state.isFocused) {
if (hasVisibleCaretOnInitialFocus()) {
this._inputRef.current.focus();
this._inputRef.current.blur();
}

this._inputRef.current.focus();
}
}
Expand Down
11 changes: 0 additions & 11 deletions spot-electron/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,6 @@ const process = require('process');

module.exports = {

/**
* Config values for the beacon functionality.
*/
beacon: {

/**
* Region ID for the beacon. This is permanent and must be unique for custom deployments.
*/
region: 'bf23c311-24ae-414b-b153-cf097836947f'
},

/**
* The default URL to connect to.
*/
Expand Down
1 change: 0 additions & 1 deletion spot-electron/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const { createApplicationWindow } = require('./src/application-window');
require('./src/spot-client-log-transport');
require('./src/application-menu');
require('./src/auto-updater');
require('./src/bt-beacon');
require('./src/client-control');
require('./src/exit');
require('./src/volume-control');
Expand Down
5,246 changes: 3,360 additions & 1,886 deletions spot-electron/package-lock.json

Large diffs are not rendered by default.

8 changes: 3 additions & 5 deletions spot-electron/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@
],
"extendInfo": {
"NSCameraUsageDescription": "Camera access is required in order to make video-calls.",
"NSMicrophoneUsageDescription": "Microphone access is required in order to make calls (audio/video).",
"NSBluetoothAlwaysUsageDescription": "Bluetooth access is required in order to detect remote controllers."
"NSMicrophoneUsageDescription": "Microphone access is required in order to make calls (audio/video)."
}
},
"publish": {
Expand All @@ -50,8 +49,8 @@
"@types/jest": "29.2.6",
"@jitsi/eslint-config": "4.1.5",
"dotenv": "16.0.3",
"electron": "22.3.25",
"electron-builder": "23.6.0",
"electron": "27.0.4",
"electron-builder": "24.4.0",
"electron-notarize": "1.2.2",
"eslint": "8.32.0",
"eslint-plugin-import": "2.27.5",
Expand Down Expand Up @@ -79,7 +78,6 @@
},
"version": "1.0.0",
"optionalDependencies": {
"@jitsi/node-ibeacons": "0.2.0",
"win-audio": "2.0.2"
}
}
63 changes: 0 additions & 63 deletions spot-electron/src/bt-beacon/btbeacon.js

This file was deleted.

73 changes: 0 additions & 73 deletions spot-electron/src/bt-beacon/daemon/darwin/bluetoothd.js

This file was deleted.

1 change: 0 additions & 1 deletion spot-electron/src/bt-beacon/daemon/darwin/index.js

This file was deleted.

12 changes: 0 additions & 12 deletions spot-electron/src/bt-beacon/daemon/index.js

This file was deleted.

3 changes: 0 additions & 3 deletions spot-electron/src/bt-beacon/index.js

This file was deleted.

Loading