ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Minor fixes to the merge.

This commit is contained in:
Marat Fayzullin 2023-11-20 11:40:47 -05:00
parent 6752beb705
commit 2b452795b0
2 changed files with 12 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
htdocs/lib/UI.js
View File

@ -240,16 +240,11 @@ UI.setTheme = function(theme) {
}
};
// Set user interface theme.
// Set chat nickname.
UI.setNickname = function(nickname) {
// Do not set twice
if (this.nickname === nickname) return;
// Save current theme name
this.nickname = nickname;
LS.save('nickname', nickname);
// Set input
$('#chatCallsign').val(nickname);
if (this.nickname !== nickname) {
this.nickname = nickname;
LS.save('nickname', nickname);
$('#chatCallsign').val(nickname);
}
};

19
htdocs/openwebrx.js
View File

@ -1023,9 +1023,9 @@ function on_ws_recv(evt) {
);
var versionInfo = 'Unknown server';
if (params.server && params.server === 'openwebrx' && params.version) {
versionInfo = 'OpenWebRX<b>+</b> version: <b>' + params.version + "</b>";
versionInfo = 'OpenWebRX+ version: ' + params.version;
}
divlog('Server acknowledged WebSocket connection, ' + versionInfo + "");
divlog('Server acknowledged WebSocket connection, ' + versionInfo);
} else {
try {
var json = JSON.parse(evt.data);
@ -1067,17 +1067,15 @@ function on_ws_recv(evt) {
fft_size = config['fft_size'];
waterfall_clear();
}
var streams_msg = "";
if ('audio_compression' in config) {
var audio_compression = config['audio_compression'];
audioEngine.setCompression(audio_compression);
streams_msg = "Audio stream is <b>" + ((audio_compression === "adpcm") ? "compressed" : "uncompressed") + "</b>. ";
divlog("Audio stream is " + ((audio_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
}
if ('fft_compression' in config) {
fft_compression = config['fft_compression'];
streams_msg += "FFT stream is <b>" + ((fft_compression === "adpcm") ? "compressed" : "uncompressed") + "</b>.";
divlog("FFT stream is " + ((fft_compression === "adpcm") ? "compressed" : "uncompressed") + ".");
}
if (streams_msg.length) divlog(streams_msg);
if ('max_clients' in config)
$('#openwebrx-bar-clients').progressbar().setMaxClients(config['max_clients']);
@ -1331,7 +1329,7 @@ function waterfall_measure_minmax_do(what) {
function on_ws_opened() {
$('#openwebrx-error-overlay').hide();
ws.send("SERVER DE CLIENT client=openwebrx.js type=receiver");
divlog("WebSocket opened to <b>" + ws.url + "</b>");
divlog("WebSocket opened to " + ws.url);
if (!networkSpeedMeasurement) {
networkSpeedMeasurement = new Measurement();
networkSpeedMeasurement.report(60000, 1000, function(rate){
@ -1372,7 +1370,7 @@ var mute = false;
var audio_buffer_maximal_length_sec = 1; //actual number of samples are calculated from sample rate
function onAudioStart(apiType){
divlog('Web Audio API initialized, with <b>' + apiType + '</b> API, sample rate: <b>' + audioEngine.getSampleRate() + "</b>Hz");
divlog('Web Audio API succesfully initialized, using ' + apiType + ' API, sample rate: ' + audioEngine.getSampleRate() + " Hz");
hideOverlay();
@ -1727,11 +1725,6 @@ function toggle_panel(what, on) {
}
item.style.transitionDuration = "600ms";
item.style.transitionDelay = "0ms";
if (what === "openwebrx-panel-log") {
setTimeout(function () {
$('#chatMessage').focus();
}, 50);
}
}
function first_show_panel(panel) {