mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from master
This commit is contained in:
@@ -2,12 +2,11 @@
|
||||
* Copyright (c) Microsoft Corporation. All rights reserved.
|
||||
* Licensed under the Source EULA. See License.txt in the project root for license information.
|
||||
*--------------------------------------------------------------------------------------------*/
|
||||
'use strict';
|
||||
|
||||
import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
|
||||
import { ViewContext } from 'vs/editor/common/view/viewContext';
|
||||
import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
|
||||
import { FastDomNode } from 'vs/base/browser/fastDomNode';
|
||||
import { RenderingContext, RestrictedRenderingContext } from 'vs/editor/common/view/renderingContext';
|
||||
import { ViewContext } from 'vs/editor/common/view/viewContext';
|
||||
import { ViewEventHandler } from 'vs/editor/common/viewModel/viewEventHandler';
|
||||
|
||||
export abstract class ViewPart extends ViewEventHandler {
|
||||
|
||||
@@ -21,7 +20,6 @@ export abstract class ViewPart extends ViewEventHandler {
|
||||
|
||||
public dispose(): void {
|
||||
this._context.removeEventHandler(this);
|
||||
this._context = null;
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
@@ -59,7 +57,7 @@ export class PartFingerprints {
|
||||
return parseInt(r, 10);
|
||||
}
|
||||
|
||||
public static collect(child: Element, stopAt: Element): Uint8Array {
|
||||
public static collect(child: Element | null, stopAt: Element): Uint8Array {
|
||||
let result: PartFingerprint[] = [], resultLen = 0;
|
||||
|
||||
while (child && child !== document.body) {
|
||||
|
||||
Reference in New Issue
Block a user