conflict_resolution
stringlengths
27
16k
<<<<<<< UnderlayContainer.modifyVisualizationArea(this.areaVisualization, s => s.visible = true) G.infoEntityPanel.updateVisualization(this.m_Entity) ======= UnderlayContainer.modifyVisualizationArea(this.areaVisualization, s => { s.visible = true }) >>>>>>> G.info...
<<<<<<< ======= /** Clear currently set filter */ public clearSlot(index: number = 0) { this.m_Filters[index].name = undefined this.m_Entity.filters = this.m_Filters this.m_UpdateSlots() this.emit('changed', false) if (this.m_Amount) this.emit('selected', -1, 0) } ...
<<<<<<< for (const item of filteredItemsInxs) { inputElement.triggerEventHandler('keyup', { key: 'p' }); ======= for (let index = 0; index < filteredItemsInxs.length; index++) { inputElement.triggerEventHandler('keydown', { key: 'p' }); >>>>>>> ...
<<<<<<< this.grid.nativeElement.focus({preventScroll: true}); firstCell = rowElement.querySelector(cellSelector); firstCell.focus(); ======= this.grid.nativeElement.focus({ preventScroll: true }); firstCell = rowElemen...
<<<<<<< IgxColumnHidingModule, ======= IgxDragDropModule, >>>>>>> IgxColumnHidingModule, IgxDragDropModule,
<<<<<<< link: "/gridGroupBy", icon: "view_column", name: "Grid GroupBy" }, { ======= link: "/gridColumnResizing", icon: "view_column", name: "Grid Column Resizing" }, { >>>>>>> link: "/gridGroupBy", ...
<<<<<<< export class IgxNavbar { private static NEXT_ID: number = 1; ======= export class IgxNavbarComponent implements AfterContentChecked { private static NEXT_ID = 1; >>>>>>> export class IgxNavbarComponent { private static NEXT_ID = 1; <<<<<<< ======= private _titleId: string; public ngAf...
<<<<<<< export const ROW_ADD_KEYS = new Set(['+', 'add', '≠', '±', '=']); export const SUPPORTED_KEYS = new Set([...Array.from(NAVIGATION_KEYS), ...Array.from(ROW_ADD_KEYS), 'enter', 'f2', 'escape', 'esc', 'pagedown', 'pageup']); export const HEADER_KEYS = new Set([...Array.from(NAVIGATION_KEYS), 'escape', 'esc', 'l'])...
<<<<<<< }, { path: "grid", component: GridSampleComponent ======= }, { path: "card", component: IgxCardSampleComponent }, { path: "range", component: IgxRangeSampleComponent }, { path: "data-operations", component: DataOpe...
<<<<<<< import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec'; ======= import { wait } from '../../test-utils/ui-interactions.spec'; import { SortingDirection } from '../../data-operations/sorting-expression.interface'; import { DefaultSortingStrategy } from '../../data-operations/sorting-strat...
<<<<<<< import { Subject } from 'rxjs'; import { isEdge } from '../../core/utils'; ======= >>>>>>> import { Subject } from 'rxjs'; <<<<<<< this.grid.transactions.getAggregatedValue(this.id, true) : this.grid.gridAPI.getRowData(this.id); ======= this.grid.transactions.getAggregatedValue(this.id...
<<<<<<< import { UIInteractions, wait } from '../test-utils/ui-interactions.spec'; ======= import { UIInteractions} from '../test-utils/ui-interactions.spec'; >>>>>>> import { UIInteractions, wait } from '../test-utils/ui-interactions.spec'; <<<<<<< ======= >>>>>>> <<<<<<< fix.detectChanges(); ...
<<<<<<< startTime = new Date() const numOfIteration = this.looper.loopCount === -1 ? '' : `of ${this.looper.loopCount}` console.log(`${chalk.bold('\u25CC')} ${iterationName} ${numOfIteration}`) ======= >>>>>>>
<<<<<<< @HostListener('keydown.pagedown', ['$event']) public onKeydownPageDown(event) { event.preventDefault(); this.verticalScrollContainer.scrollNextPage(); this.nativeElement.focus(); } @HostListener('keydown.pageup', ['$event']) public onKeydownPageUp(event) { e...
<<<<<<< public static restoreGroups(groupData: IGroupByResult, state: IGroupingState): any[] { ======= public static restoreGroups<T>(data: T[], state: IGroupingState, groupsRecords: any[] = []): T[] { >>>>>>> public static restoreGroups(groupData: IGroupByResult, state: IGroupingState, groupsRecords: an...
<<<<<<< import { CancelableEventArgs } from '../core/utils'; ======= import { configureTestSuite } from '../test-utils/configure-suite'; >>>>>>> import { CancelableEventArgs } from '../core/utils'; import { configureTestSuite } from '../test-utils/configure-suite';
<<<<<<< @Input() public remoteVirtualization: boolean; ======= @Input() public primaryKey; >>>>>>> @Input() public remoteVirtualization: boolean; public primaryKey;
<<<<<<< export * from './lib/grids/hierarchical-grid/hierarchical-grid.pipes'; export * from './lib/icon/index'; export * from './lib/input-group/index'; export * from './lib/list/index'; export * from './lib/expansion-panel/index'; ======= export * from './lib/icon/public_api'; export * from './lib/input-group/publi...
<<<<<<< ======= OnChanges, SimpleChanges, HostListener >>>>>>> HostListener
<<<<<<< import { IgxTreeGridComponent, IgxHierarchicalTransactionService, IgxGridTransaction } from 'igniteui-angular'; ======= import { IgxTreeGridComponent, IgxExcelExporterService, IgxCsvExporterService, IgxExcelExporterOptions, IgxCsvExporterOptions, CsvFileTypes } from 'igniteui-angular'; >>>>>>> import { ...
<<<<<<< it('Should clear search criteria when selecting clear column filters option.', fakeAsync(() => { GridFunctions.clickExcelFilterIconFromCode(fix, grid, 'ProductName'); let checkboxes = GridFunctions.getExcelStyleFilteringCheckboxes(fix); fix.detectChanges(); ...
<<<<<<< import { IgxTreeGridNavigationService } from './tree-grid-navigation.service'; ======= import { IgxSummaryResult } from '../summaries/grid-summary'; import { IgxGridSummaryService } from '../summaries/grid-summary.service'; >>>>>>> import { IgxTreeGridNavigationService } from './tree-grid-navigation.service'...
<<<<<<< [removable]="true" [selectable]="true" (remove)="chipRemoved($event)"> <igx-icon igxPrefix fontSet="material">drag_indicator</igx-icon> ======= [removable]="true" [selectable]="true" (onRemove)="chipRemoved($event)"> <igx-icon igxPrefix>drag_indi...
<<<<<<< private _render(camera: Camera, renderTarget: BaseRenderTarget | null, material: Material | null) { ======= private _render(camera: Camera, renderTarget: BaseRenderTexture | null, material?: Material) { >>>>>>> private _render(camera: Camera, renderTarget: BaseRenderTexture | null, ma...
<<<<<<< ======= grid.onFilteringDone.emit(this.column.filteringExpressionsTree); >>>>>>> grid.onFilteringDone.emit(this.column.filteringExpressionsTree); <<<<<<< grid.onFilteringDone.emit({ fieldName: this.column.field, condition: filterExpression.expression.conditi...
<<<<<<< /** * @hidden */ @Input() @HostBinding('class.igx-grid__td--active') public active: boolean; ======= @HostBinding('attr.aria-selected') get ariaSelected() { return this.selected || this.column.selected || this.row.selected; } >>>>>>> /** * @hidden ...
<<<<<<< /** * Sets/gets the highlight class of the cell. * Default value is `"igx-highlight"`. * ```typescript * let highlightClass = this.cell.highlightClass; * ``` * ```typescript * this.cell.highlightClass = 'igx-cell-highlight'; * ``` * @memberof IgxGridCellComponent...
<<<<<<< public highlight(text: string, caseSensitive?: boolean, exactMatch?: boolean): number { ======= /** * Clears the existing highlight and highlights the searched text. * Returns how many times the element contains the searched text. */ public highlight(text: string, caseSensitive?: bo...
<<<<<<< export * from "./view/containerView"; export * from "./view/deploymentView"; export * from "./view/elementView"; export * from "./view/relationshipView"; export * from "./view/staticView"; export * from "./view/styles"; export * from "./view/systemContextView"; export * from "./view/view"; export * from "./view...
<<<<<<< import * as PgPromise from 'pg-promise' import { mapValues } from 'lodash' const pgp = PgPromise() export class Database { private db constructor(connectionString: string) { this.db = pgp(connectionString) } public async getDBSchema(tableName: string) { let schema = {} ...
<<<<<<< ======= link: '/gridToolbarCustom', icon: 'view_column', name: 'Grid Toolbar Custom Content' }, { link: '/treeGrid', icon: 'view_column', name: 'Tree Grid' }, { link: '/treeGridFlatData', ...
<<<<<<< import { GridMasterDetailSampleComponent } from './grid-master-detail/grid-master-detail.sample'; ======= import { GridExternalFilteringComponent } from './grid-external-filtering/grid-external-filtering.sample'; >>>>>>> import { GridExternalFilteringComponent } from './grid-external-filtering/grid-external-...
<<<<<<< * An @Input property that sets the value of the `id` attribute. * @example * ```html * <igx-icon id="igx-icon-1" family="material">settings</igx-icon> * ``` */ @HostBinding('attr.id') @Input() public id = `igx-icon-${NEXT_ID++}`; /** * An @Input property that ...
<<<<<<< private _columnList: any[]; private flatRecords: IExportRecord[] = []; private _columnWidthList: number[]; protected _indexOfLastPinnedColumn = -1; protected _sort = null; ======= >>>>>>> private flatRecords: IExportRecord[] = []; <<<<<<< protected abstract exportDataImplementa...
<<<<<<< get maxLevelHeaderDepth() { if (this._maxLevelHeaderDepth === null) { this._maxLevelHeaderDepth = this.columnList.reduce((acc, col) => Math.max(acc, col.level), 0); } return this._maxLevelHeaderDepth; } ======= /* Toolbar related definitions */ private _s...
<<<<<<< if (!this.column.pinned) { this.row.virtDirRow.scrollPrev(); } else { this.row.virtDirRow.scrollTo(this.grid.unpinnedColumns.length - 1); } this.row.virtDirRow.onChunkLoad.first().subscribe({ ======= ...
<<<<<<< import { UIInteractions } from '../../test-utils/ui-interactions.spec'; import { IgxGridRowComponent } from './grid-row.component'; ======= import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; >>>>>>> import { UIInteractions, wait } from '../../test-utils/ui-interactions.spec'; impor...
<<<<<<< export * from "./navigation/nav-service"; export * from "./navigation/IToggleView"; ======= export * from "./navigation/nav.service"; export * from "./navigation/toggle"; >>>>>>> export * from "./navigation/IToggleView"; export * from "./navigation/nav.service";
<<<<<<< import { Subject } from 'rxjs'; ======= import { CancelableEventArgs } from '../core/utils'; >>>>>>> import { Subject } from 'rxjs'; import { CancelableEventArgs } from '../core/utils';
<<<<<<< public static triggerInputEvent(inputElement: DebugElement, inputValue: string) { inputElement.nativeElement.value = inputValue; inputElement.triggerEventHandler('input', { target: inputElement.nativeElement }); } ======= public static sendInputElementValue(element: HTMLInputEleme...
<<<<<<< import { HammerGestureConfig } from '@angular/platform-browser'; import { scaleInVerBottom, scaleInVerTop } from '../animations/main'; ======= >>>>>>> import { scaleInVerBottom, scaleInVerTop } from '../animations/main';
<<<<<<< import { JSZipWrapper } from './jszip-verification-wrapper.spec'; import { FileContentData } from './test-data.service.spec'; ======= import { JSZipWrapper } from './jszip-verification-wrapper.spec'; import { ExportTestDataService, FileContentData } from './test-data.service.spec'; >>>>>>> import { JSZipWrap...
<<<<<<< experiments: Map<string, Experiment>; ======= userSweepTask?: NodeJS.Timeout; >>>>>>> experiments: Map<string, Experiment>; userSweepTask?: NodeJS.Timeout; <<<<<<< async loadExperiments() { this.experiments = new Map(); const experiments = await this.db.query("SELECT * FROM experiments;");...
<<<<<<< ViewChild ======= TemplateRef, ViewChild, ViewEncapsulation >>>>>>> TemplateRef, ViewChild
<<<<<<< const groupingExpr = grid.groupingExpressions.find((expr) => expr.fieldName === this.column.field); const sortDir = groupingExpr ? this.sortDirection + 1 > SortingDirection.Desc ? SortingDirection.Asc : SortingDirection.Desc : this.sortDir...
<<<<<<< import { IColumnMovingEventArgs } from './grid.component'; ======= import { SortingDirection } from '../data-operations/sorting-expression.interface'; >>>>>>> import { IColumnMovingEventArgs } from './grid.component'; import { SortingDirection } from '../data-operations/sorting-expression.interface'; <<<<<<...
<<<<<<< import { Subject } from 'rxjs'; import { takeUntil, first, filter } from 'rxjs/operators'; ======= import ResizeObserver from 'resize-observer-polyfill'; import { Subject, combineLatest, pipe } from 'rxjs'; import { takeUntil, first, filter, throttleTime, map } from 'rxjs/operators'; import { IgxSelectionAPIS...
<<<<<<< IFilteringExpression, IFilteringState, IGroupByRecord, IGroupingState, IPagingState, ISortingExpression, ISortingState, PagingError, SortingDirection ======= IFilteringExpression, IFilteringState, IPagingState, ISortingExpression, ISortin...
<<<<<<< } @Component({ template: ` <igx-tree-grid #treeGrid [data]="data" childDataKey="Employees" width="900px" height="600px"> <igx-column [field]="'ID'" dataType="number" [sortable]="true"></igx-column> <igx-column [field]="'Name'" dataType="string" [sortable]="true"></igx-column> <i...
<<<<<<< super(selectionService, crudService, gridAPI, cdr, helement, zone, touchManager); ======= super(selectionService, crudService, gridAPI, cdr, helement, zone, touchManager, platformUtil); // this.hSelection = <IgxHierarchicalSelectionAPIService>selection; >>>>>>> ...
<<<<<<< import { Component, OnInit, ViewChild, Input, Inject } from '@angular/core'; import { IgxGridComponent, ColumnPinningPosition, RowPinningPosition, IgxGridRowComponent, IgxTransactionService, IgxGridTransaction, IgxHierarchicalGridComponent, DisplayDensityToken, DisplayDensit...
<<<<<<< protected _groupBy(name: string, direction = SortingDirection.Asc, ignoreCase = true) { this.gridAPI.groupBy(this.id, name, direction, ignoreCase); } protected _groupByMultiple(expressions: ISortingExpression[]) { this.gridAPI.groupBy_multiple(this.id, expressions); } prote...
<<<<<<< import { GridGroupBySampleModule } from "./grid-groupby/sample.module"; ======= import { GridPerformanceSampleModule } from "./grid-performance/sample.module"; import { GridSummarySampleModule } from "./grid-summaries/sample.module"; import { GridSampleModule } from "./grid/sample.module"; >>>>>>> import { G...
<<<<<<< import { IgxGridSelectionService, IgxGridCRUDService } from '../selection/selection.service'; import { IgxForOfSyncService } from '../../directives/for-of/for_of.sync.service'; ======= import { IgxGridSelectionService, IgxGridCRUDService } from '../../core/grid-selection'; import { IgxForOfSyncService, IgxFor...
<<<<<<< import { WatchChanges } from './watch-changes'; ======= import { IgxGridHeaderGroupComponent } from './grid-header-group.component'; import { IgxGridToolbarCustomContentDirective } from './grid-toolbar.component'; import { IGridResourceStrings } from '../core/i18n/grid-resources'; import { CurrentResourceStri...
<<<<<<< protected _groupKey: string | number; protected _textKey = ''; ======= protected _groupKey: string | number = ''; public customValueFlag = true; >>>>>>> protected _groupKey: string | number = ''; protected _textKey: string | number = ''; <<<<<<< private _searchInput: ElementRef; ...
<<<<<<< it("Filtering and row selection", async(() => { const fix = TestBed.createComponent(GridWithSelectionFilteringComponent); fix.detectChanges(); const grid = fix.componentInstance.gridSelection4; const headerRow: HTMLElement = fix.nativeElement.querySelector(".igx-grid__thead"...
<<<<<<< export class IgxGridSummaryComponent implements IGridBus, AfterContentInit, OnInit, DoCheck { ======= export class IgxGridSummaryComponent implements IGridBus, OnInit, DoCheck { >>>>>>> export class IgxGridSummaryComponent implements IGridBus, OnInit, DoCheck, AfterContentInit { <<<<<<< public summaryIt...
<<<<<<< import { GridSelectionMode } from '../types'; ======= import { GridFunctions } from '../../test-utils/grid-functions.spec'; >>>>>>> import { GridSelectionMode } from '../types'; import { GridFunctions } from '../../test-utils/grid-functions.spec';
<<<<<<< import { IgxAdvancedFilteringDialogComponent } from './filtering/advanced-filtering/advanced-filtering-dialog.component'; import { FilterMode, GridKeydownTargetType, GridSelectionMode, GridSummaryPosition, GridSummaryCalculationMode } from './types'; ======= >>>>>>> import { IgxAdvancedFilteringDialogCompone...
<<<<<<< set rowSelection(selectionMode: GridSelectionMode) { ======= set rowSelection(selectionMode: GridSelectionMode) { >>>>>>> set rowSelection(selectionMode: GridSelectionMode) { <<<<<<< ======= /** * Pin the row by its id. * @remarks * ID is either the primaryKey value or the...
<<<<<<< GridColumnsWidthComponent, GridAutogeneratedColumnsComponent ======= GridAutogeneratedColumnsComponent, GridRemoteVirtualizationComponent >>>>>>> GridColumnsWidthComponent, GridAutogeneratedColumnsComponent, ...
<<<<<<< ======= private _data: any[]; private _scrollWidth: number; /** * An @Input property that lets you fill the `IgxGridComponent` with an array of data. * ```html * <igx-grid [data]="Data" [autoGenerate]="true"></igx-grid> * ``` * @memberof IgxGridBaseComponent */ @Inp...
<<<<<<< IgxGridSharedModules, IgxColumnActionsModule ======= IgxColumnActionsModule, IgxColumnHidingModule, IgxColumnPinningModule, IgxGridSharedModules >>>>>>> IgxColumnActionsModule, IgxGridSharedModules
<<<<<<< import { takeUntil } from 'rxjs/operators'; ======= import { IgxColumnComponent } from '../column.component'; >>>>>>> import { IgxColumnComponent } from '../column.component'; import { takeUntil } from 'rxjs/operators';
<<<<<<< import { HierarchicalGridRemoteVirtualizationComponent } from './hierarchical-grid-remote-virtualization/hierarchical-grid-remote-virtualization'; ======= import { GridVirtualizationScrollSampleComponent } from './grid-remote-virtualization-with-scroll/grid-remote-virtualization-scroll.sample'; >>>>>>> impor...
<<<<<<< import { IForOfState, IgxForOfDirective } from '../directives/for-of/for_of.directive'; import { IgxTextHighlightDirective } from '../directives/text-highlight/text-highlight.directive'; import { IgxBaseExporter } from '../services/index'; ======= import { IgxForOfDirective } from '../directives/for-of/for_of...
<<<<<<< import {ViewportAction, ViewportCommand} from "../../../src/features/viewport/viewport" import {MouseTool} from "../../../src/base/view/mouse-tool" import {SelectMouseListener} from "../../../src/features/select/select" import {MoveMouseListener} from "../../../src/features/move" import {ScrollMouseListener} fr...
<<<<<<< public cellInEditMode: IgxGridCellComponent; public draggedColumn: IgxColumnComponent; ======= public isColumnMoving: boolean; >>>>>>> public draggedColumn: IgxColumnComponent;
<<<<<<< @Input() public primaryKey; ======= @Input() public columnWidth: string = null; >>>>>>> @Input() public columnWidth: string = null; @Input() public primaryKey; <<<<<<< public onRowSelection = new EventEmitter<any>(); @Output() public onColumnPinning = new Eve...
<<<<<<< const FOCUSED_DETAILS_ROW_CLASS = 'igx-grid__tr-container--active'; ======= export const PAGER_CLASS = '.igx-paginator__pager'; >>>>>>> const FOCUSED_DETAILS_ROW_CLASS = 'igx-grid__tr-container--active'; export const PAGER_CLASS = '.igx-paginator__pager'; <<<<<<< */ public static getFilterRow(fix: C...
<<<<<<< import { cloneArray, KEYS } from '../../../core/utils'; ======= import { FilteringLogic, IFilteringExpression } from '../../../data-operations/filtering-expression.interface'; import { cloneArray, KEYS, resolveNestedPath } from '../../../core/utils'; >>>>>>> import { cloneArray, KEYS, resolveNestedPath } fro...
<<<<<<< public static calcMaxSummaryHeight(columnList, summaries: DebugElement[], defaultRowHeight) { let maxSummaryLength = 0; let index = 0; columnList.filter((col) => col.hasSummary).forEach((column) => { const currentLength = summaries[index].queryAll(By.css(SUMMARY_LABEL_CLA...
<<<<<<< protected subscriptionOnEdit$; protected subscriptionOnAdd$; protected subscriptionOnDelete$; protected subscriptionOnFilter$; public summaryItemHeight; ======= >>>>>>> public summaryItemHeight; <<<<<<< ngAfterContentInit() { if (this.column.hasSummary) { this...
<<<<<<< GridFunctions.focusCell(fixture, fChildCell); await wait(100); fixture.detectChanges(); ======= firstChildCell.nativeElement.focus(); tick(); >>>>>>> GridFunctions.focusCell(fixture, fChildCell); await wait(100); ...
<<<<<<< ======= * The default aria role attribute for the component. * * @hidden * @internal */ @HostBinding('attr.role') public role = 'grid'; /** * The default aria lebelled by attribute for the component. * * @hidden * @internal */ @HostBinding('at...
<<<<<<< AfterViewInit, Renderer2, Directive, HostListener, TemplateRef ======= Renderer2 >>>>>>> Renderer2, TemplateRef
<<<<<<< const grid = fix.componentInstance.grid; grid.sort('Name', SortingDirection.Asc, true); ======= const grid = fix.componentInstance.grid1; grid.sort({fieldName: 'Name', dir: SortingDirection.Asc, ignoreCase: true}); >>>>>>> const grid = fix.componentInstance.grid; ...
<<<<<<< import { IgxGridCellComponent, IGridCellEventArgs } from '../grid'; ======= import { IgxSummaryCellComponent } from '../summaries/summary-cell.component'; const DEBOUNCE_TIME = 60; const CHIP_ITEM_CLASS = '.igx-chip__item'; const FILTER_CELL_CLASS = '.igx-grid__filtering-cell'; >>>>>>> import { IgxGridCellC...
<<<<<<< ======= private d$ = new Subject<boolean>(); >>>>>>> <<<<<<< * * @memberof IgxToastComponent ======= * @memberof IgxGridCellComponent >>>>>>> * * @memberof IgxToastComponent <<<<<<< * Wraps @hide() method due @IToggleView interface implementation. * * @hidden...
<<<<<<< ======= import {selectConfig} from '../selectors'; import {ExpandedType} from 'compassql/build/src/query/expandedtype'; >>>>>>>
<<<<<<< import { IgxStringFilteringOperand } from '../../data-operations/filtering-condition'; ======= import { IgxGridTransaction } from '../tree-grid'; import { IgxTransactionService } from '../../services'; >>>>>>> import { IgxGridTransaction } from '../tree-grid'; import { IgxTransactionService } from '../../ser...
<<<<<<< /** * @hidden */ protected setEventBusSubscription() { this.eventBus.pipe( debounceTime(DEBOUNCE_TIME), takeUntil(this.destroy$) ).subscribe(() => this.cdr.detectChanges()); } /** * @hidden */ protected setVerticalScrollSubscriptio...
<<<<<<< export interface IGridDataBindable { data: any[]; filteredData: any[]; } /** * @hidden * @internal */ export interface GridType extends IGridDataBindable { ======= export interface GridType { id: string; >>>>>>> export interface IGridDataBindable { data: any[]; filteredData: any[]; } ...
<<<<<<< ======= }); })); // Rendering it('All appropriate classes should be applied on combo initialization', () => { const defaultComboWidth = '250px'; const defaultComboDDWidth = '100%'; const fix = TestBed.createComponent(IgxComboScrollTestComponent); fix.detect...
<<<<<<< import { IgxDropDownItemComponent, IgxDropDownItemBase } from './drop-down-item.component'; ======= import { IgxDropDownItemComponent } from './drop-down-item.component'; import { IPositionStrategy } from '../services/overlay/position/IPositionStrategy'; import { OverlaySettings } from '../services'; >>>>>>>...
<<<<<<< IgxGridFilteringESFTemplatesComponent, IgxGridFilteringESFLoadOnDemandComponent ======= IgxGridFilteringESFTemplatesComponent, IgxGridFilteringMCHComponent >>>>>>> IgxGridFilteringESFTemplatesComponent, IgxGridFil...
<<<<<<< import { Component, DebugElement, OnInit, ViewChild } from "@angular/core"; ======= import { Component, DebugElement, ViewChild, OnInit } from "@angular/core"; >>>>>>> import { Component, DebugElement, OnInit, ViewChild } from "@angular/core"; <<<<<<< const width = parseInt(column.width, 10); ...
<<<<<<< set filteringExpressions(value) { this._filteringExpressions = cloneArray(value); this.cdr.markForCheck(); ======= set filteringExpressionsTree(value) { if (value) { this._filteringExpressionsTree = value; this.clearSummaryCache(); this._pip...
<<<<<<< import { cloneArray } from '../../core/utils'; import { DataUtil } from '../../data-operations/data-util'; ======= import { IgxColumnComponent, IgxColumnGroupComponent } from '../grid'; >>>>>>> import { cloneArray } from '../../core/utils'; import { DataUtil } from '../../data-operations/data-util'; import {...
<<<<<<< @Output() public onGroupingDone = new EventEmitter<any>(); ======= @Output() public onDataPreLoad = new EventEmitter<any>(); @Output() public onColumnResized = new EventEmitter<IColumnResizeEventArgs>(); @Output() public onContextMenu = new EventEmitter<IGridCellEventArgs>()...
<<<<<<< export * from './navbar/navbar.component'; export * from './directives/filter.directive'; export * from './directives/ripple.directive'; export * from './badge/badge.component'; ======= export * from './navbar/navbar'; export * from './directives/filter'; export * from './directives/ripple'; export * from './...
<<<<<<< protected getPossibleColumnWidth(baseWidth: number = null) { let computedWidth; if (baseWidth !== null) { computedWidth = baseWidth; } else { computedWidth = parseInt(this.document.defaultView.getComputedStyle(this.nativeElement).getPropertyValue('width'), 10)...
<<<<<<< it("should use default column width for cells with width in %.", () => { const fix = TestBed.createComponent(VirtualtGridComponent); fix.componentInstance.defaultWidth = "25%"; fix.detectChanges(); const rows = fix.componentInstance.instance.rowList; rows.forEach((ite...
<<<<<<< const collection = record.parent ? record.parent.data[this.childDataKey] : this.data; index = this.primaryKey ? collection.map(c => c[this.primaryKey]).indexOf(rowID) : collection.indexOf(rowID); ======= const childData = record.parent ? rec...
<<<<<<< collectionViewModel(collectionRep: CollectionMember, routeData: PaneRouteData): CollectionViewModel; listPlaceholderViewModel(routeData : PaneRouteData): CollectionPlaceholderViewModel; ======= collectionViewModel(collection: CollectionMember, routeData: PaneRouteData): CollectionViewM...
<<<<<<< it('should pin an unpinned column when drag/drop it among pinned columns.', (async() => { const fix = TestBed.createComponent(GridRightPinningComponent); fix.detectChanges(); const grid = fix.componentInstance.instance; grid.pinning = { columns: ColumnP...
<<<<<<< public onChipRemoveMove() { // We don't remove chip if user starting touch interacting on the remove button moves the chip this._movedWhileRemoving = true; } public onChipRemoveEnd() { if (!this._movedWhileRemoving) { this.onChipRemove(); } this._...
<<<<<<< ======= get columnHiding() { return this._columnHiding; } set columnHiding(value) { this._columnHiding = value; if (this.gridAPI.get(this.id)) { this.markForCheck(); } } public get displayDensity(): DisplayDensity | string { return t...
<<<<<<< igx_grid_watermark_placeholder?: string; ======= igx_grid_pinned_row_indicator?: string; >>>>>>> igx_grid_watermark_placeholder?: string; igx_grid_pinned_row_indicator?: string; <<<<<<< igx_grid_advanced_filter_value_placeholder: 'Value', igx_grid_watermark_placeholder: 'Text Message...