diff --git a/VERSION.properties b/VERSION.properties index 58084888..f32a4bf4 100644 --- a/VERSION.properties +++ b/VERSION.properties @@ -1,2 +1,2 @@ -client.version=1.2.350 +client.version=1.2.351 server.version=1.2.319 diff --git a/shine-UI/js/services/call-ui-service.js b/shine-UI/js/services/call-ui-service.js index f544c50b..7271f918 100644 --- a/shine-UI/js/services/call-ui-service.js +++ b/shine-UI/js/services/call-ui-service.js @@ -272,6 +272,9 @@ function applyExpandedState(snapshot) { updateMuteButtons(muted); updateSpeakerButtons(Boolean(snapshot.speakerEnabled)); + minimizeBtn.hidden = incomingStage; + minimizeBtn.disabled = incomingStage; + speakerBtn.hidden = incomingStage || !snapshot.canToggleSpeaker; speakerBtn.disabled = !snapshot.canToggleSpeaker; @@ -287,17 +290,19 @@ function applyMinimizedState(snapshot) { overlayEl.hidden = true; barEl.hidden = false; barTextEl.textContent = buildBarText(snapshot); + const incomingStage = Boolean(snapshot.canAnswer || snapshot.canDecline); const muted = Boolean(snapshot.muted); updateMuteButtons(muted); updateSpeakerButtons(Boolean(snapshot.speakerEnabled)); - barSpeakerBtn.hidden = !snapshot.canToggleSpeaker; + barSpeakerBtn.hidden = incomingStage || !snapshot.canToggleSpeaker; barSpeakerBtn.disabled = !snapshot.canToggleSpeaker; - barMuteBtn.hidden = !snapshot.canMute; + barMuteBtn.hidden = incomingStage || !snapshot.canMute; barMuteBtn.disabled = !snapshot.canMute; - const canEnd = snapshot.canHangup || snapshot.canDecline; + const canEnd = !incomingStage && snapshot.canHangup; barHangupBtn.hidden = !canEnd; barHangupBtn.disabled = !canEnd; - setButtonIcon(barHangupBtn, 'hangup', snapshot.canDecline && !snapshot.canHangup ? 'Отклонить звонок' : 'Положить трубку'); + setButtonIcon(barHangupBtn, 'hangup', 'Положить трубку'); + barActionsEl.hidden = incomingStage || (!snapshot.canToggleSpeaker && !snapshot.canMute && !canEnd); } function syncShellState() {