mirror of
https://github.com/wavetermdev/backup.git
synced 2026-08-05 13:57:07 -07:00
swap order (activescreen needs screens set)
This commit is contained in:
+12
-12
@@ -2589,6 +2589,18 @@ class Model {
|
||||
}
|
||||
}
|
||||
let update : ModelUpdateType = genUpdate;
|
||||
if ("screens" in update) {
|
||||
if (update.connect) {
|
||||
this.screenList.clear();
|
||||
}
|
||||
genMergeData(this.screenList, update.screens, (s : Screen) => s.screenId, (sdata : ScreenDataType) => sdata.screenid, (sdata : ScreenDataType) => new Screen(sdata), null);
|
||||
for (let i=0; i<update.screens.length; i++) {
|
||||
let screen = update.screens[i];
|
||||
if (screen.remove) {
|
||||
this.removeWindowByScreenId(screen.screenid);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ("sessions" in update) {
|
||||
if (update.connect) {
|
||||
this.sessionList.clear();
|
||||
@@ -2607,18 +2619,6 @@ class Model {
|
||||
}
|
||||
}
|
||||
}
|
||||
if ("screens" in update) {
|
||||
if (update.connect) {
|
||||
this.screenList.clear();
|
||||
}
|
||||
genMergeData(this.screenList, update.screens, (s : Screen) => s.screenId, (sdata : ScreenDataType) => sdata.screenid, (sdata : ScreenDataType) => new Screen(sdata), null);
|
||||
for (let i=0; i<update.screens.length; i++) {
|
||||
let screen = update.screens[i];
|
||||
if (screen.remove) {
|
||||
this.removeWindowByScreenId(screen.screenid);
|
||||
}
|
||||
}
|
||||
}
|
||||
if ("activesessionid" in update) {
|
||||
this._activateSession(update.activesessionid);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user