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

Remove builder references from options dialog (#4774)

Browse Source 
* remove more builder references; remove $ from declarations

* fix jquery references

* formatting

* fixing backup

* fix backup box
This commit is contained in:
Anthony Dresser
2019-04-02 13:49:50 -07:00
committed by GitHub
parent 72ef024678
commit 63485c8c78
29 changed files with 261 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
this.onPostEventHandler.subscribe(this._grid.onRendered, () => this.onPostRender());
}
this._$container = $(this._grid.getContainerNode());
this._$container = jQuery(this._grid.getContainerNode());
this._$container.on('dblclick.autosize', '.slick-resizable-handle', e => this.handleDoubleClick(e));
this._context = document.createElement('canvas').getContext('2d');
}
@@ -67,7 +67,7 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
return;
}
let headerColumnsQuery = $(this._grid.getContainerNode()).find('.slick-header-columns');
let headerColumnsQuery = jQuery(this._grid.getContainerNode()).find('.slick-header-columns');
if (headerColumnsQuery && headerColumnsQuery.length) {
let headerColumns = headerColumnsQuery[0];
let origCols = this._grid.getColumns();
@@ -78,7 +78,7 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
});
let change = false;
for (let i = 0; i <= headerColumns.children.length; i++) {
let headerEl = $(headerColumns.children.item(i));
let headerEl = jQuery(headerColumns.children.item(i));
let columnDef = headerEl.data('column');
if (columnDef) {
let headerWidth = this.getElementWidth(headerEl[0]);
@@ -100,7 +100,7 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
}
private handleDoubleClick(e: JQuery.Event<HTMLElement, string>) {
let headerEl = $(e.currentTarget).closest('.slick-header-column');
let headerEl = jQuery(e.currentTarget).closest('.slick-header-column');
let columnDef = headerEl.data('column');
if (!columnDef || !columnDef.resizable) {
@@ -150,9 +150,9 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
}
private getTemplateWidth(rowEl: JQuery, template: JQuery | HTMLElement): number {
let cell = $(rowEl.find('.slick-cell'));
let cell = jQuery(rowEl.find('.slick-cell'));
cell.append(template);
$(cell).find('*').css('position', 'relative');
jQuery(cell).find('*').css('position', 'relative');
return cell.outerWidth() + 1;
}
@@ -163,7 +163,7 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
texts.forEach((text, index) => {
let template;
if (formatFun) {
template = $('<span>' + formatFun(index, colIndex, text, columnDef, data[index]) + '</span>');
template = jQuery('<span>' + formatFun(index, colIndex, text, columnDef, data[index]) + '</span>');
text = template.text() || text;
}
let length = text ? this.getElementWidthUsingCanvas(rowEl, text) : 0;
@@ -176,19 +176,19 @@ export class AutoColumnSize<T> implements Slick.Plugin<T> {
}
private createRow(columnDef): JQuery {
let rowEl = $('<div class="slick-row"><div class="slick-cell"></div></div>');
let rowEl = jQuery('<div class="slick-row"><div class="slick-cell"></div></div>');
rowEl.find('.slick-cell').css({
'visibility': 'hidden',
'text-overflow': 'initial',
'white-space': 'nowrap'
});
let gridCanvas = this._$container.find('.grid-canvas');
$(gridCanvas).append(rowEl);
jQuery(gridCanvas).append(rowEl);
return rowEl;
}
private deleteRow(rowEl: JQuery) {
$(rowEl).remove();
jQuery(rowEl).remove();
}
private getElementWidth(element: HTMLElement): number {

8
src/sql/base/browser/ui/table/plugins/cellRangeSelector.ts
View File

@@ -92,8 +92,8 @@ export class CellRangeSelector<T> implements ICellRangeSelector<T> {
this.grid.setActiveCell(cell.row, cell.cell);
let start = this.grid.getCellFromPoint(
dd.startX - $(this.canvas).offset().left,
dd.startY - $(this.canvas).offset().top);
dd.startX - jQuery(this.canvas).offset().left,
dd.startY - jQuery(this.canvas).offset().top);
dd.range = { start: start, end: undefined };
this.currentlySelectedRange = dd.range;
@@ -108,8 +108,8 @@ export class CellRangeSelector<T> implements ICellRangeSelector<T> {
e.stopImmediatePropagation();
let end = this.grid.getCellFromPoint(
e.pageX - $(this.canvas).offset().left,
e.pageY - $(this.canvas).offset().top);
e.pageX - jQuery(this.canvas).offset().left,
e.pageY - jQuery(this.canvas).offset().top);
if (!this.grid.canCellBeSelected(end.row, end.cell)) {
return;

6
src/sql/base/browser/ui/table/plugins/checkboxSelectColumn.plugin.ts
View File

@@ -108,7 +108,7 @@ export class CheckboxSelectColumn<T> implements Slick.Plugin<T> {
private handleClick(e: Event, args: Slick.OnClickEventArgs<T>): void {
// clicking on a row select checkbox
if (this._grid.getColumns()[args.cell].id === this._options.columnId && $(e.target).is('input[type="checkbox"]')) {
if (this._grid.getColumns()[args.cell].id === this._options.columnId && jQuery(e.target).is('input[type="checkbox"]')) {
// if editing, try to commit
if (this._grid.getEditorLock().isActive() && !this._grid.getEditorLock().commitCurrentEdit()) {
e.preventDefault();
@@ -131,7 +131,7 @@ export class CheckboxSelectColumn<T> implements Slick.Plugin<T> {
}
private handleHeaderClick(e: Event, args: Slick.OnHeaderClickEventArgs<T>): void {
if (!this._options.title && args.column.id === this._options.columnId && $(e.target).is('input[type="checkbox"]')) {
if (!this._options.title && args.column.id === this._options.columnId && jQuery(e.target).is('input[type="checkbox"]')) {
// if editing, try to commit
if (this._grid.getEditorLock().isActive() && !this._grid.getEditorLock().commitCurrentEdit()) {
e.preventDefault();
@@ -139,7 +139,7 @@ export class CheckboxSelectColumn<T> implements Slick.Plugin<T> {
return;
}
if ($(e.target).is('input[checked]')) {
if (jQuery(e.target).is('input[checked]')) {
let rows = [];
for (let i = 0; i < this._grid.getDataLength(); i++) {
rows.push(i);

64
src/sql/base/browser/ui/table/plugins/headerFilter.plugin.ts
View File

@@ -41,14 +41,14 @@ export class HeaderFilter {
.subscribe(this.grid.onKeyDown, (e) => this.handleKeyDown);
this.grid.setColumns(this.grid.getColumns());
$(document.body).bind('mousedown', this.handleBodyMouseDown);
$(document.body).bind('keydown', this.handleKeyDown);
jQuery(document.body).bind('mousedown', this.handleBodyMouseDown);
jQuery(document.body).bind('keydown', this.handleKeyDown);
}
public destroy() {
this.handler.unsubscribeAll();
$(document.body).unbind('mousedown', this.handleBodyMouseDown);
$(document.body).unbind('keydown', this.handleKeyDown);
jQuery(document.body).unbind('mousedown', this.handleBodyMouseDown);
jQuery(document.body).unbind('keydown', this.handleKeyDown);
}
private handleKeyDown = (e) => {
@@ -60,7 +60,7 @@ export class HeaderFilter {
}
private handleBodyMouseDown = (e) => {
if (this.$menu && this.$menu[0] !== e.target && !$.contains(this.$menu[0], e.target)) {
if (this.$menu && this.$menu[0] !== e.target && !jQuery.contains(this.$menu[0], e.target)) {
this.hideMenu();
e.preventDefault();
e.stopPropagation();
@@ -79,7 +79,7 @@ export class HeaderFilter {
if (column.id === '_detail_selector') {
return;
}
let $el = $('<div></div>')
let $el = jQuery('<div></div>')
.addClass('slick-header-menubutton')
.data('column', column);
@@ -87,19 +87,19 @@ export class HeaderFilter {
}
private handleBeforeHeaderCellDestroy(e, args) {
$(args.node)
jQuery(args.node)
.find('.slick-header-menubutton')
.remove();
}
private addMenuItem(menu, columnDef, title, command, image) {
let $item = $('<div class="slick-header-menuitem">')
let $item = jQuery('<div class="slick-header-menuitem">')
.data('command', command)
.data('column', columnDef)
.bind('click', (e) => this.handleMenuItemClick(e, command, columnDef))
.appendTo(menu);
let $icon = $('<div class="slick-header-menuicon">')
let $icon = jQuery('<div class="slick-header-menuicon">')
.appendTo($item);
if (title === 'Sort Ascending') {
@@ -108,17 +108,17 @@ export class HeaderFilter {
$icon.get(0).className += ' descending';
}
$('<span class="slick-header-menucontent">')
jQuery('<span class="slick-header-menucontent">')
.text(title)
.appendTo($item);
}
private addMenuInput(menu, columnDef) {
const self = this;
$('<input class="input" placeholder="Search" style="margin-top: 5px; width: 206px">')
jQuery('<input class="input" placeholder="Search" style="margin-top: 5px; width: 206px">')
.data('column', columnDef)
.bind('keyup', (e) => {
let filterVals = this.getFilterValuesByInput($(e.target));
let filterVals = this.getFilterValuesByInput(jQuery(e.target));
self.updateFilterInputs(menu, columnDef, filterVals);
})
.appendTo(menu);
@@ -139,15 +139,15 @@ export class HeaderFilter {
+ '/>' + filterItems[i] + '</label>';
}
let $filter = menu.find('.filter');
$filter.empty().append($(filterOptions));
$filter.empty().append(jQuery(filterOptions));
$(':checkbox', $filter).bind('click', (e) => {
this.workingFilters = this.changeWorkingFilter(filterItems, this.workingFilters, $(e.target));
jQuery(':checkbox', $filter).bind('click', (e) => {
this.workingFilters = this.changeWorkingFilter(filterItems, this.workingFilters, jQuery(e.target));
});
}
private showFilter(e) {
let $menuButton = $(e.target);
let $menuButton = jQuery(e.target);
this.columnDef = $menuButton.data('column');
this.columnDef.filterValues = this.columnDef.filterValues || [];
@@ -167,7 +167,7 @@ export class HeaderFilter {
}
if (!this.$menu) {
this.$menu = $('<div class="slick-header-menu">').appendTo(document.body);
this.$menu = jQuery('<div class="slick-header-menu">').appendTo(document.body);
}
this.$menu.empty();
@@ -186,15 +186,15 @@ export class HeaderFilter {
+ '/>' + escape(filterItems[i]) + '</label>';
}
}
let $filter = $('<div class="filter">')
.append($(filterOptions))
let $filter = jQuery('<div class="filter">')
.append(jQuery(filterOptions))
.appendTo(this.$menu);
this.okButton = new Button(this.$menu.get(0));
this.okButton.label = 'OK';
this.okButton.title = 'OK';
this.okButton.element.id = 'filter-ok-button';
let okElement = $('#filter-ok-button');
let okElement = jQuery('#filter-ok-button');
okElement.bind('click', (ev) => {
this.columnDef.filterValues = this.workingFilters.splice(0);
this.setButtonImage($menuButton, this.columnDef.filterValues.length > 0);
@@ -205,7 +205,7 @@ export class HeaderFilter {
this.clearButton.label = 'Clear';
this.clearButton.title = 'Clear';
this.clearButton.element.id = 'filter-clear-button';
let clearElement = $('#filter-clear-button');
let clearElement = jQuery('#filter-clear-button');
clearElement.bind('click', (ev) => {
this.columnDef.filterValues.length = 0;
this.setButtonImage($menuButton, false);
@@ -216,23 +216,23 @@ export class HeaderFilter {
this.cancelButton.label = 'Cancel';
this.cancelButton.title = 'Cancel';
this.cancelButton.element.id = 'filter-cancel-button';
let cancelElement = $('#filter-cancel-button');
let cancelElement = jQuery('#filter-cancel-button');
cancelElement.bind('click', () => this.hideMenu());
attachButtonStyler(this.okButton, this._themeService);
attachButtonStyler(this.clearButton, this._themeService);
attachButtonStyler(this.cancelButton, this._themeService);
$(':checkbox', $filter).bind('click', (e) => {
this.workingFilters = this.changeWorkingFilter(filterItems, this.workingFilters, $(e.target));
jQuery(':checkbox', $filter).bind('click', (e) => {
this.workingFilters = this.changeWorkingFilter(filterItems, this.workingFilters, jQuery(e.target));
});
let offset = $(e.target).offset();
let left = offset.left - this.$menu.width() + $(e.target).width() - 8;
let offset = jQuery(e.target).offset();
let left = offset.left - this.$menu.width() + jQuery(e.target).width() - 8;
let menutop = offset.top + $(e.target).height();
let menutop = offset.top + jQuery(e.target).height();
if (menutop + offset.top > $(window).height()) {
menutop -= (this.$menu.height() + $(e.target).height() + 8);
if (menutop + offset.top > jQuery(window).height()) {
menutop -= (this.$menu.height() + jQuery(e.target).height() + 8);
}
this.$menu.css('top', menutop)
.css('left', (left > 0 ? left : 0));
@@ -249,10 +249,10 @@ export class HeaderFilter {
if ($checkbox.val() < 0) {
// Select All
if ($checkbox.prop('checked')) {
$(':checkbox', $filter).prop('checked', true);
jQuery(':checkbox', $filter).prop('checked', true);
workingFilters = filterItems.slice(0);
} else {
$(':checkbox', $filter).prop('checked', false);
jQuery(':checkbox', $filter).prop('checked', false);
workingFilters.length = 0;
}
} else {
@@ -359,4 +359,4 @@ export class HeaderFilter {
e.preventDefault();
e.stopPropagation();
}
}
}

8
src/sql/base/browser/ui/table/plugins/rowDetailView.ts
View File

@@ -60,12 +60,12 @@ export class RowDetailView {
}
public setOptions(options: any) {
this._options = $.extend(true, {}, this._options, options);
this._options = jQuery.extend(true, {}, this._options, options);
}
public handleClick(e: any, args: any): void {
// clicking on a row select checkbox
if (this._options.useRowClick || this._grid.getColumns()[args.cell].id === this._options.columnId && $(e.target).hasClass('detailView-toggle')) {
if (this._options.useRowClick || this._grid.getColumns()[args.cell].id === this._options.columnId && jQuery(e.target).hasClass('detailView-toggle')) {
// if editing, try to commit
if (this._grid.getEditorLock().isActive() && !this._grid.getEditorLock().commitCurrentEdit()) {
e.preventDefault();
@@ -151,9 +151,9 @@ export class RowDetailView {
// Saves the current state of the detail view
public saveDetailView(item) {
let view = $('#innerDetailView_' + item.id);
let view = jQuery('#innerDetailView_' + item.id);
if (view) {
let html = $('#innerDetailView_' + item.id).html();
let html = jQuery('#innerDetailView_' + item.id).html();
if (html !== undefined) {
item._detailContent = html;
}

2
src/sql/base/browser/ui/table/plugins/rowSelectionModel.plugin.ts
View File

@@ -128,7 +128,7 @@ export class RowSelectionModel<T extends Slick.SlickData> implements Slick.Selec
}
let selection = this.rangesToRows(this._ranges);
let idx = $.inArray(cell.row, selection);
let idx = jQuery.inArray(cell.row, selection);
if (idx === -1 && (e.ctrlKey || e.metaKey)) {
selection.push(cell.row);