Skip to content

Commit ce1e3da

Browse files
committed
Fix patch to reset columns if getting started is disabled
1 parent cba1dd7 commit ce1e3da

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

patches/getting-started.diff

+15-5
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
3232
+ $('a', {
3333
+ href: 'https://cdr.co/code-server-to-coder',
3434
+ target: '_blank',
35-
+ },
35+
+ },
3636
+ $('button', {
3737
+ style: [
3838
+ 'padding: 10px 16px ',
@@ -85,20 +85,30 @@ Index: code-server/lib/vscode/src/vs/workbench/contrib/welcomeGettingStarted/bro
8585

8686
const leftColumn = $('.categories-column.categories-column-left', {},);
8787
const rightColumn = $('.categories-column.categories-column-right', {},);
88-
@@ -775,13 +834,13 @@ export class GettingStartedPage extends
88+
@@ -775,13 +834,23 @@ export class GettingStartedPage extends
8989
const layoutLists = () => {
9090
if (gettingStartedList.itemCount) {
9191
this.container.classList.remove('noWalkthroughs');
9292
- reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
9393
- reset(rightColumn, gettingStartedList.getDomElement());
94-
+ reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), gettingStartedList.getDomElement());
95-
+ reset(rightColumn, gettingStartedCoder);
94+
+ if (this.contextService.contextMatchesRules(IsEnabledCoderGettingStarted)) {
95+
+ reset(leftColumn, startList.getDomElement(), recentList.getDomElement(), gettingStartedList.getDomElement());
96+
+ reset(rightColumn, gettingStartedCoder);
97+
+ } else {
98+
+ reset(leftColumn, startList.getDomElement(), recentList.getDomElement());
99+
+ reset(rightColumn, gettingStartedList.getDomElement());
100+
+ }
101+
+
96102
recentList.setLimit(5);
97103
}
98104
else {
99105
this.container.classList.add('noWalkthroughs');
100106
- reset(leftColumn, startList.getDomElement());
101-
+ reset(leftColumn, startList.getDomElement(), gettingStartedCoder);
107+
+ if (this.contextService.contextMatchesRules(IsEnabledCoderGettingStarted)) {
108+
+ reset(leftColumn, startList.getDomElement(), gettingStartedCoder);
109+
+ } else {
110+
+ reset(leftColumn, startList.getDomElement());
111+
+ }
102112
reset(rightColumn, recentList.getDomElement());
103113
recentList.setLimit(10);
104114
}

0 commit comments

Comments
 (0)