Skip to content

Commit

Permalink
Revert "sash: rename"
Browse files Browse the repository at this point in the history
This reverts commit 19dcc2d.
  • Loading branch information
joaomoreno committed Jun 8, 2018
1 parent 03a19a1 commit 4eb0c38
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions src/vs/base/browser/ui/sash/sash.ts
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,9 @@ export class Sash {
}

private linkedEndSashDisposables: IDisposable[] = [];
private _linkedEndSashes: Sash[] = [];
get linkedEndSashes(): Sash[] { return this._linkedEndSashes; }
set linkedEndSashes(sashes: Sash[]) {
private _linkedEndSash: Sash[] = [];
get linkedEndSash(): Sash[] { return this._linkedEndSash; }
set linkedEndSash(sashes: Sash[]) {
this.linkedEndSashDisposables = dispose(this.linkedEndSashDisposables);

if (sashes) {
Expand All @@ -129,7 +129,7 @@ export class Sash {
this.onLinkedEndSashEnablementChange([]);
}

this._linkedEndSashes = sashes;
this._linkedEndSash = sashes;
}

constructor(container: HTMLElement, layoutProvider: ISashLayoutProvider, options: ISashOptions = {}) {
Expand All @@ -156,7 +156,7 @@ export class Sash {
this.layoutProvider = layoutProvider;

this.linkedStartSashes = options.linkedStartSashes || [];
this.linkedEndSashes = options.linkedEndSashes || [];
this.linkedEndSash = options.linkedEndSashes || [];

toggleClass(this.el, 'debug', DEBUG);
}
Expand Down Expand Up @@ -189,13 +189,13 @@ export class Sash {
if (e.offsetY <= 4) {
linkedSashes = this.linkedStartSashes;
} else if (e.offsetY >= this.el.clientHeight - 4) {
linkedSashes = this.linkedEndSashes;
linkedSashes = this.linkedEndSash;
}
} else {
if (e.offsetX <= 4) {
linkedSashes = this.linkedStartSashes;
} else if (e.offsetX >= this.el.clientWidth - 4) {
linkedSashes = this.linkedEndSashes;
linkedSashes = this.linkedEndSash;
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/vs/base/browser/ui/splitview/splitview.ts
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ export class SplitView implements IDisposable {
get linkedEndSashes(): Sash[] { return this._linkedEndSashes; }
set linkedEndSashes(sashes: Sash[]) {
for (const sashItem of this.sashItems) {
sashItem.sash.linkedEndSashes = sashes;
sashItem.sash.linkedEndSash = sashes;
}

this._linkedEndSashes = sashes;
Expand Down

0 comments on commit 4eb0c38

Please sign in to comment.