Upstream/waveterm
1
0
Fork 0
mirror of https://github.com/wavetermdev/waveterm.git synced 2025-01-04 18:59:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix settings to always set the correct session/screen

Browse Source
This commit is contained in:
sawka 2023-03-17 21:15:42 -07:00
parent 708cc809a0
commit 2a2d356814
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripthaus.md
View File

@ -80,7 +80,7 @@ open out/Prompt-darwin-x64/Prompt.app
DMG_VERSION=$(node -e 'console.log(require("./version.js"))') DMG_VERSION=$(node -e 'console.log(require("./version.js"))')
DMG_NAME="prompt-macos-x86-${DMG_VERSION}.dmg" DMG_NAME="prompt-macos-x86-${DMG_VERSION}.dmg"
rm *.dmg rm *.dmg
../../create-dmg/create-dmg/create-dmg \ /Users/mike/work/gopath/src/github.com/create-dmg/create-dmg/create-dmg \
--volname "Prompt" \ --volname "Prompt" \
--window-pos 200 120 \ --window-pos 200 120 \
--window-size 600 300 \ --window-size 600 300 \

6
src/model.ts
View File

@ -3333,15 +3333,17 @@ class CommandRunner {
GlobalModel.submitCommand("screen", "set", null, {"focus": focusVal, "nohist": "1"}, false); GlobalModel.submitCommand("screen", "set", null, {"focus": focusVal, "nohist": "1"}, false);
} }
screenSetSettings(settings : {tabcolor? : string, name? : string}) : void { screenSetSettings(screenId : string, settings : {tabcolor? : string, name? : string}) : void {
let kwargs = Object.assign({}, settings); let kwargs = Object.assign({}, settings);
kwargs["nohist"] = "1"; kwargs["nohist"] = "1";
kwargs["screen"] = screenId;
GlobalModel.submitCommand("screen", "set", null, kwargs, true); GlobalModel.submitCommand("screen", "set", null, kwargs, true);
} }
sessionSetSettings(settings : {name? : string}) : void { sessionSetSettings(sessionId : string, settings : {name? : string}) : void {
let kwargs = Object.assign({}, settings); let kwargs = Object.assign({}, settings);
kwargs["nohist"] = "1"; kwargs["nohist"] = "1";
kwargs["session"] = sessionId;
GlobalModel.submitCommand("session", "set", null, kwargs, true); GlobalModel.submitCommand("session", "set", null, kwargs, true);
} }

4
src/settings.tsx
View File

@ -56,7 +56,7 @@ class ScreenSettingsModal extends React.Component<{sessionId : string, screenId
settings.name = this.tempName.get(); settings.name = this.tempName.get();
} }
if (Object.keys(settings).length > 0) { if (Object.keys(settings).length > 0) {
GlobalCommandRunner.screenSetSettings(settings); GlobalCommandRunner.screenSetSettings(this.props.screenId, settings);
} }
if (this.tempArchived.get() != screen.archived.get()) { if (this.tempArchived.get() != screen.archived.get()) {
GlobalCommandRunner.screenArchive(screen.screenId, this.tempArchived.get()); GlobalCommandRunner.screenArchive(screen.screenId, this.tempArchived.get());
@ -181,7 +181,7 @@ class SessionSettingsModal extends React.Component<{sessionId : string}, {}> {
handleOK() : void { handleOK() : void {
mobx.action(() => { mobx.action(() => {
GlobalModel.sessionSettingsModal.set(null); GlobalModel.sessionSettingsModal.set(null);
GlobalCommandRunner.sessionSetSettings({ GlobalCommandRunner.sessionSetSettings(this.props.sessionId, {
"name": this.tempName.get(), "name": this.tempName.get(),
}); });
})(); })();