Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion localtypings/pxteditor.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -820,7 +820,7 @@ declare namespace pxt.editor {
simSerialActive?: boolean;
deviceSerialActive?: boolean;
errorListState?: ErrorListState;
errorListCollapsedByUser?: boolean;
errorListCollapsed?: boolean;
screenshoting?: boolean;
extensionsVisible?: boolean;
isMultiplayerGame?: boolean; // Arcade: Does the current project contain multiplayer blocks?
Expand Down
3 changes: 2 additions & 1 deletion webapp/src/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,8 @@ export class ProjectView
isMultiplayerGame: false,
activeTourConfig: undefined,
mute: pxt.editor.MuteState.Unmuted,
feedback: {showing: false, kind: "generic"} // state that tracks if the feedback modal is showing and what kind
feedback: {showing: false, kind: "generic"}, // state that tracks if the feedback modal is showing and what kind
errorListCollapsed: true // error pane is collapsed by default
};
if (!this.settings.editorFontSize) this.settings.editorFontSize = /mobile/i.test(navigator.userAgent) ? 15 : 19;
if (!this.settings.fileHistory) this.settings.fileHistory = [];
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/blocks.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1105,7 +1105,7 @@ export class Editor extends toolboxeditor.ToolboxEditor {
<ErrorList
errors={this.errors}
onSizeChange={this.onErrorListResize}
collapsedByUser={this.parent.state.errorListCollapsedByUser}
collapsedByUser={this.parent.state.errorListCollapsed}
onUserCollapse={this.setErrorListCollapsePreference}
getErrorHelp={this.getErrorHelp}
showLoginDialog={this.parent.showLoginDialog}
Expand All @@ -1122,7 +1122,7 @@ export class Editor extends toolboxeditor.ToolboxEditor {

protected setErrorListCollapsePreference = (collapsed: boolean) => {
this.parent.setState({
errorListCollapsedByUser: collapsed
errorListCollapsed: collapsed
});
}

Expand Down
4 changes: 2 additions & 2 deletions webapp/src/monaco.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ export class Editor extends toolboxeditor.ToolboxEditor {
{showErrorList && (
<ErrorList
onSizeChange={this.setErrorListState}
collapsedByUser={this.parent.state.errorListCollapsedByUser}
collapsedByUser={this.parent.state.errorListCollapsed}
onUserCollapse={this.setErrorListCollapsePreference}
errors={this.errors}
startDebugger={this.startDebugger}
Expand Down Expand Up @@ -963,7 +963,7 @@ export class Editor extends toolboxeditor.ToolboxEditor {

protected setErrorListCollapsePreference = (collapsed: boolean) => {
this.parent.setState({
errorListCollapsedByUser: collapsed
errorListCollapsed: collapsed
});
}

Expand Down
Loading