mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 (#14883)
* Merge from vscode bead496a613e475819f89f08e9e882b841bc1fe8 * Bump distro * Upgrade GCC to 4.9 due to yarn install errors * Update build image * Fix bootstrap base url * Bump distro * Fix build errors * Update source map file * Disable checkbox for blocking migration issues (#15131) * disable checkbox for blocking issues * wip * disable checkbox fixes * fix strings * Remove duplicate tsec command * Default to off for tab color if settings not present * re-skip failing tests * Fix mocha error * Bump sqlite version & fix notebooks search view * Turn off esbuild warnings * Update esbuild log level * Fix overflowactionbar tests * Fix ts-ignore in dropdown tests * cleanup/fixes * Fix hygiene * Bundle in entire zone.js module * Remove extra constructor param * bump distro for web compile break * bump distro for web compile break v2 * Undo log level change * New distro * Fix integration test scripts * remove the "no yarn.lock changes" workflow * fix scripts v2 * Update unit test scripts * Ensure ads-kerberos2 updates in .vscodeignore * Try fix unit tests * Upload crash reports * remove nogpu * always upload crashes * Use bash script * Consolidate data/ext dir names * Create in tmp directory Co-authored-by: chlafreniere <hichise@gmail.com> Co-authored-by: Christopher Suh <chsuh@microsoft.com> Co-authored-by: chgagnon <chgagnon@microsoft.com>
This commit is contained in:
@@ -12,7 +12,7 @@ import throttle = require('lodash.throttle');
|
||||
|
||||
declare let acquireVsCodeApi: any;
|
||||
|
||||
let scrollDisabled = true;
|
||||
let scrollDisabledCount = 0;
|
||||
const marker = new ActiveLineMarker();
|
||||
const settings = getSettings();
|
||||
|
||||
@@ -37,19 +37,39 @@ window.onload = () => {
|
||||
updateImageSizes();
|
||||
};
|
||||
|
||||
|
||||
function doAfterImagesLoaded(cb: () => void) {
|
||||
const imgElements = document.getElementsByTagName('img');
|
||||
if (imgElements.length > 0) {
|
||||
const ps = Array.from(imgElements).map(e => {
|
||||
if (e.complete) {
|
||||
return Promise.resolve();
|
||||
} else {
|
||||
return new Promise<void>((resolve) => {
|
||||
e.addEventListener('load', () => resolve());
|
||||
e.addEventListener('error', () => resolve());
|
||||
});
|
||||
}
|
||||
});
|
||||
Promise.all(ps).then(() => setImmediate(cb));
|
||||
} else {
|
||||
setImmediate(cb);
|
||||
}
|
||||
}
|
||||
|
||||
onceDocumentLoaded(() => {
|
||||
const scrollProgress = state.scrollProgress;
|
||||
|
||||
if (typeof scrollProgress === 'number' && !settings.fragment) {
|
||||
setImmediate(() => {
|
||||
scrollDisabled = true;
|
||||
doAfterImagesLoaded(() => {
|
||||
scrollDisabledCount += 1;
|
||||
window.scrollTo(0, scrollProgress * document.body.clientHeight);
|
||||
});
|
||||
return;
|
||||
}
|
||||
|
||||
if (settings.scrollPreviewWithEditor) {
|
||||
setImmediate(() => {
|
||||
doAfterImagesLoaded(() => {
|
||||
// Try to scroll to fragment if available
|
||||
if (settings.fragment) {
|
||||
state.fragment = undefined;
|
||||
@@ -57,12 +77,12 @@ onceDocumentLoaded(() => {
|
||||
|
||||
const element = getLineElementForFragment(settings.fragment);
|
||||
if (element) {
|
||||
scrollDisabled = true;
|
||||
scrollDisabledCount += 1;
|
||||
scrollToRevealSourceLine(element.line);
|
||||
}
|
||||
} else {
|
||||
if (!isNaN(settings.line!)) {
|
||||
scrollDisabled = true;
|
||||
scrollDisabledCount += 1;
|
||||
scrollToRevealSourceLine(settings.line!);
|
||||
}
|
||||
}
|
||||
@@ -72,8 +92,8 @@ onceDocumentLoaded(() => {
|
||||
|
||||
const onUpdateView = (() => {
|
||||
const doScroll = throttle((line: number) => {
|
||||
scrollDisabled = true;
|
||||
scrollToRevealSourceLine(line);
|
||||
scrollDisabledCount += 1;
|
||||
doAfterImagesLoaded(() => scrollToRevealSourceLine(line));
|
||||
}, 50);
|
||||
|
||||
return (line: number) => {
|
||||
@@ -109,7 +129,7 @@ let updateImageSizes = throttle(() => {
|
||||
}, 50);
|
||||
|
||||
window.addEventListener('resize', () => {
|
||||
scrollDisabled = true;
|
||||
scrollDisabledCount += 1;
|
||||
updateScrollProgress();
|
||||
updateImageSizes();
|
||||
}, true);
|
||||
@@ -189,8 +209,8 @@ document.addEventListener('click', event => {
|
||||
window.addEventListener('scroll', throttle(() => {
|
||||
updateScrollProgress();
|
||||
|
||||
if (scrollDisabled) {
|
||||
scrollDisabled = false;
|
||||
if (scrollDisabledCount > 0) {
|
||||
scrollDisabledCount -= 1;
|
||||
} else {
|
||||
const line = getEditorLineNumberForPageOffset(window.scrollY);
|
||||
if (typeof line === 'number' && !isNaN(line)) {
|
||||
|
||||
Reference in New Issue
Block a user