ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-13 17:22:15 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add mark.js and jquery typings (#21066)

Browse Source
This commit is contained in:
Charles Gagnon
2022-11-02 09:18:03 -07:00
committed by GitHub
parent 9d921e4efc
commit 649b23e6c8
6 changed files with 28 additions and 4618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -135,7 +135,9 @@
"@types/gulp-postcss": "^8.0.0",
"@types/gulp-svgmin": "^1.2.1",
"@types/http-proxy-agent": "^2.0.1",
"@types/jquery": "^3.5.14",
"@types/keytar": "^4.4.0",
"@types/mark.js": "^8.11.8",
"@types/minimist": "^1.2.1",
"@types/mocha": "^9.1.1",
"@types/node": "16.x",

4
src/sql/base/browser/ui/table/plugins/autoSizeColumns.plugin.ts
View File

@@ -85,7 +85,7 @@ export class AutoColumnSize<T extends Slick.SlickData> implements Slick.Plugin<T
let colIndices: number[] = [];
for (let i = 0; i <= headerColumns.children.length; i++) {
let headerEl = jQuery(headerColumns.children.item(i)!);
let headerEl = jQuery(headerColumns.children.item(i)! as HTMLElement);
let columnDef = headerEl.data('column');
if (columnDef) {
headerElements.push(headerEl[0]);
@@ -118,7 +118,7 @@ export class AutoColumnSize<T extends Slick.SlickData> implements Slick.Plugin<T
}
}
private handleDoubleClick(e: JQuery.Event<HTMLElement, unknown>) {
private handleDoubleClick(e: JQuery.TriggeredEvent<HTMLElement, unknown>) {
let headerEl = jQuery(e.currentTarget).closest('.slick-header-column');
let columnDef = headerEl.data('column');

4
src/sql/base/browser/ui/table/table.ts
View File

@@ -131,7 +131,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
this._grid.onColumnsResized.subscribe(() => this._onColumnResize.fire());
this._grid.onKeyDown.subscribe((e, args: Slick.OnKeyDownEventArgs<T>) => {
const evt = (e as JQuery.Event).originalEvent as KeyboardEvent;
const evt = (e as JQuery.TriggeredEvent).originalEvent as KeyboardEvent;
this._onKeyDown.fire({
event: evt,
cell: {
@@ -151,7 +151,7 @@ export class Table<T extends Slick.SlickData> extends Widget implements IDisposa
private mapMouseEvent(slickEvent: Slick.Event<any>, emitter: Emitter<ITableMouseEvent>) {
slickEvent.subscribe((e: Slick.EventData) => {
const originalEvent = (e as JQuery.Event).originalEvent;
const originalEvent = (e as JQuery.TriggeredEvent).originalEvent;
const cell = this._grid.getCellFromEvent(originalEvent);
const anchor = originalEvent instanceof MouseEvent ? { x: originalEvent.x, y: originalEvent.y } : originalEvent.srcElement as HTMLElement;
emitter.fire({ anchor, cell });

6
src/sql/workbench/contrib/notebook/browser/cellViews/output.component.ts
View File

@@ -226,7 +226,7 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
markCurrent = new Mark(elementContainingText.children[range.startColumn]);
markCurrent?.mark(this.searchTerm, {
className: findRangeSpecificClass,
each: function (node, range) {
each: function (node) {
// node is the marked DOM element
node.scrollIntoView({ behavior: 'smooth', block: 'center' });
}
@@ -253,7 +253,7 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
separateWordSearch: true,
});
// if there are grids
let grids = document.querySelectorAll(GRID_CLASS);
let grids = document.querySelectorAll<HTMLElement>(GRID_CLASS);
grids?.forEach(g => {
markAllOccurances = new Mark(g);
markAllOccurances.mark(this.searchTerm, {
@@ -281,7 +281,7 @@ export class OutputComponent extends CellView implements OnInit, AfterViewInit {
markAllOccurances.unmark({ acrossElements: true, className: findRangeSpecificClass });
this.highlightRange = undefined;
// if there is a grid
let grids = document.querySelectorAll(GRID_CLASS);
let grids = document.querySelectorAll<HTMLElement>(GRID_CLASS);
grids?.forEach(g => {
markAllOccurances = new Mark(g);
markAllOccurances.unmark({ acrossElements: true, className: findHighlightClass });

4611
src/typings/jQuery.d.ts vendored
View File

File diff suppressed because it is too large Load Diff

19
yarn.lock
View File

@@ -899,6 +899,13 @@
dependencies:
"@types/node" "*"
"@types/jquery@*", "@types/jquery@^3.5.14":
version "3.5.14"
resolved "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.14.tgz#ac8e11ee591e94d4d58da602cb3a5a8320dee577"
integrity sha512-X1gtMRMbziVQkErhTQmSe2jFwwENA/Zr+PprCkF63vFq+Yt5PZ4AlKqgmeNlwgn7dhsXEK888eIW2520EpC+xg==
dependencies:
"@types/sizzle" "*"
"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
version "7.0.11"
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
@@ -911,6 +918,13 @@
dependencies:
keytar "*"
"@types/mark.js@^8.11.8":
version "8.11.8"
resolved "https://registry.yarnpkg.com/@types/mark.js/-/mark.js-8.11.8.tgz#5a48743bd5445ddff46c41d290ec9fcabe807522"
integrity sha512-BoWCd9ydi1hZxDfu/lF0v1hHMsNUjuxZEDJsdHlmm6GlKk4qxlLya7D3FS81QmabwFbYPpoDOh9603JESUkHbA==
dependencies:
"@types/jquery" "*"
"@types/minimatch@*":
version "3.0.5"
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
@@ -987,6 +1001,11 @@
resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e"
integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA==
"@types/sizzle@*":
version "2.3.3"
resolved "https://registry.yarnpkg.com/@types/sizzle/-/sizzle-2.3.3.tgz#ff5e2f1902969d305225a047c8a0fd5c915cebef"
integrity sha512-JYM8x9EGF163bEyhdJBpR2QX1R5naCJHC8ucJylJ3w9/CVBaskdQ8WqBf8MmQrd1kRvp/a4TS8HJ+bxzR7ZJYQ==
"@types/source-list-map@*":
version "0.1.2"
resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"