Merge main into german/i18n-plurals-context

This commit is contained in:
German Khokhlov committed 2026-11-17 19:29:53 +04:00
commit 64b9cef14b
209 files changed
+35415 -701

No files matched your search

+2 -1
View File
@@ -811,10 +811,11 @@ export function exit({ restoreTracking = true } = {}) {
this.services.satellitesLayer?.refocusTrackedById?.(satelliteSubject);
}
this.syncEntry();
// Back to whichever entry was used: the Contacts button or the readout's.
// Return to the card or readout control that opened Cockpit.
const readoutEntry = document.getElementById('cockpit-entry-readout');
const restoreTarget =
this.entryFocusOrigin === this.entry ||
this.entryFocusOrigin?.hasAttribute('data-entity-cockpit-entry') ||
(readoutEntry && this.entryFocusOrigin === readoutEntry)
? this.entryFocusOrigin
: this.entry || this.entryFocusOrigin;