Skip to content

Commit f4975d6

Browse files
Scheduler - Apply naming convention to workspace and tooltip strategy files
1 parent be721b7 commit f4975d6

3 files changed

Lines changed: 49 additions & 49 deletions

File tree

packages/devextreme/js/__internal/scheduler/tooltip_strategies/m_tooltip_strategy_base.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ export class TooltipStrategyBase {
2222

2323
protected tooltip: any;
2424

25-
// used externally by m_scheduler.ts
25+
// TODO: used externally by m_scheduler.ts
2626
_options: any;
2727

2828
protected extraOptions: any;

packages/devextreme/js/__internal/scheduler/workspaces/m_timeline.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class SchedulerTimeline extends SchedulerWorkSpace {
6767
return getBoundingRect((this.$element() as any).get(0)).height;
6868
}
6969

70-
protected override _dateTableScrollableConfig() {
71-
const config = super._dateTableScrollableConfig();
70+
protected override dateTableScrollableConfig() {
71+
const config = super.dateTableScrollableConfig();
7272
const timelineConfig = {
7373
direction: HORIZONTAL,
7474
};

packages/devextreme/js/__internal/scheduler/workspaces/m_work_space.ts

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -206,15 +206,15 @@ type WorkspaceOptionsInternal = Omit<dxSchedulerOptions, 'groups'> & {
206206
endDayHour: number;
207207
};
208208
class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
209-
_viewDataProvider: any;
209+
private viewDataProviderValue: any;
210210

211-
_cache: any;
211+
private cacheValue: any;
212212

213-
_cellsSelectionState: any;
213+
private cellsSelectionStateValue: any;
214214

215-
_cellsSelectionController: any;
215+
private cellsSelectionControllerValue: any;
216216

217-
// used externally by shaders, grouped strategies, m_agenda.ts
217+
// TODO: used externally by shaders, grouped strategies, m_agenda.ts
218218
_dateTableScrollable!: Scrollable;
219219

220220
private selectionChangedAction: any;
@@ -227,24 +227,24 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
227227

228228
protected getToday?(): Date;
229229

230-
// used externally by current_time_shader_vertical.ts
230+
// TODO: used externally by current_time_shader_vertical.ts
231231
_$allDayPanel: any;
232232

233233
private $allDayTitle: any;
234234

235235
private $headerPanelEmptyCell: any;
236236

237-
// used externally by m_timeline.ts, m_work_space_indicator.ts
237+
// TODO: used externally by m_timeline.ts, m_work_space_indicator.ts
238238
_groupedStrategy: any;
239239

240240
public virtualScrollingDispatcher: any;
241241

242242
private scrollSync: any;
243243

244-
// used externally by m_work_space_grouped_strategy_vertical.ts
244+
// TODO: used externally by m_work_space_grouped_strategy_vertical.ts
245245
_$headerPanel: any;
246246

247-
// used externally by m_timeline.ts, m_agenda.ts, m_work_space_month.ts
247+
// TODO: used externally by m_timeline.ts, m_agenda.ts, m_work_space_month.ts
248248
_$dateTable: any;
249249

250250
private $allDayTable: any;
@@ -263,15 +263,15 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
263263

264264
private contextMenuAction: any;
265265

266-
// used externally by m_agenda.ts
266+
// TODO: used externally by m_agenda.ts
267267
_$groupTable: any;
268268

269-
// used externally by m_timeline.ts
269+
// TODO: used externally by m_timeline.ts
270270
_$thead: any;
271271

272272
private headerScrollable: any;
273273

274-
// used externally by m_timeline.ts
274+
// TODO: used externally by m_timeline.ts
275275
_sidebarScrollable: any;
276276

277277
private preventDefaultDragging: any;
@@ -284,7 +284,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
284284

285285
positionHelper!: PositionHelper;
286286

287-
// used externally by m_work_space_grouped_strategy_vertical.ts
287+
// TODO: used externally by m_work_space_grouped_strategy_vertical.ts
288288
_$headerPanelContainer: any;
289289

290290
private $headerTablesContainer: any;
@@ -293,7 +293,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
293293

294294
private $allDayContainer: any;
295295

296-
// used externally by m_agenda.ts
296+
// TODO: used externally by m_agenda.ts
297297
_$dateTableScrollableContent: any;
298298

299299
private $sidebarScrollableContent: any;
@@ -304,10 +304,10 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
304304

305305
private allDayPanels!: any[];
306306

307-
// used externally by m_timeline.ts
307+
// TODO: used externally by m_timeline.ts
308308
_$flexContainer: any;
309309

310-
// used externally by shaders, m_timeline.ts, m_work_space_indicator.ts
310+
// TODO: used externally by shaders, m_timeline.ts, m_work_space_indicator.ts
311311
_shader: any;
312312

313313
protected $sidebarTable: any;
@@ -337,27 +337,27 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
337337
}
338338

339339
get viewDataProvider(): ViewDataProvider {
340-
if (!this._viewDataProvider) {
341-
this._viewDataProvider = new ViewDataProvider(this.type as ViewType);
340+
if (!this.viewDataProviderValue) {
341+
this.viewDataProviderValue = new ViewDataProvider(this.type as ViewType);
342342
}
343-
return this._viewDataProvider;
343+
return this.viewDataProviderValue;
344344
}
345345

346346
get cache() {
347-
if (!this._cache) {
348-
this._cache = new Cache();
347+
if (!this.cacheValue) {
348+
this.cacheValue = new Cache();
349349
}
350350

351-
return this._cache;
351+
return this.cacheValue;
352352
}
353353

354354
get resourceManager(): ResourceManager {
355355
return this.option('getResourceManager')();
356356
}
357357

358358
get cellsSelectionState() {
359-
if (!this._cellsSelectionState) {
360-
this._cellsSelectionState = new CellsSelectionState(this.viewDataProvider);
359+
if (!this.cellsSelectionStateValue) {
360+
this.cellsSelectionStateValue = new CellsSelectionState(this.viewDataProvider);
361361

362362
const selectedCellsOption: any = this.option('selectedCellData');
363363

@@ -380,19 +380,19 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
380380
};
381381
});
382382

383-
this._cellsSelectionState.setSelectedCellsByData(validSelectedCells);
383+
this.cellsSelectionStateValue.setSelectedCellsByData(validSelectedCells);
384384
}
385385
}
386386

387-
return this._cellsSelectionState;
387+
return this.cellsSelectionStateValue;
388388
}
389389

390390
get cellsSelectionController() {
391-
if (!this._cellsSelectionController) {
392-
this._cellsSelectionController = new CellsSelectionController();
391+
if (!this.cellsSelectionControllerValue) {
392+
this.cellsSelectionControllerValue = new CellsSelectionController();
393393
}
394394

395-
return this._cellsSelectionController;
395+
return this.cellsSelectionControllerValue;
396396
}
397397

398398
get isAllDayPanelVisible() {
@@ -556,8 +556,8 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
556556

557557
if (!this.viewDataProvider.isSameCell(focusedCellData, nextCellData)) {
558558
const $cell = nextCellData.allDay && !this.isVerticalGroupedWorkSpace()
559-
? this.dom_getAllDayPanelCell(nextCellPosition.columnIndex)
560-
: this.dom_getDateCell(nextCellPosition);
559+
? this.domGetAllDayPanelCell(nextCellPosition.columnIndex)
560+
: this.domGetDateCell(nextCellPosition);
561561
const isNextCellAllDay = nextCellData.allDay;
562562

563563
this.setSelectedCellsStateAndUpdateSelection(isNextCellAllDay, nextCellPosition, isMultiSelection, $cell);
@@ -647,7 +647,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
647647
return Boolean(this.option('groups')?.length) && this.option('groupOrientation') === 'vertical';
648648
}
649649

650-
// used externally by shaders, m_timeline.ts
650+
// TODO: used externally by shaders, m_timeline.ts
651651
_isHorizontalGroupedWorkSpace() {
652652
return Boolean(this.option('groups')?.length) && this.option('groupOrientation') === 'horizontal';
653653
}
@@ -671,7 +671,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
671671
this.$allDayTitle = $('<div>').appendTo(this.$headerPanelEmptyCell);
672672
}
673673

674-
protected _dateTableScrollableConfig() {
674+
protected dateTableScrollableConfig() {
675675
let config: any = {
676676
useKeyboard: false,
677677
bounceEnabled: false,
@@ -834,7 +834,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
834834
});
835835
}
836836

837-
// used externally by grouped strategies, shaders, m_timeline.ts
837+
// TODO: used externally by grouped strategies, shaders, m_timeline.ts
838838
_getCellCount() {
839839
return this.viewDataProvider.getCellCount({
840840
intervalCount: this.option('intervalCount'),
@@ -1153,7 +1153,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
11531153
);
11541154
}
11551155

1156-
// used externally by grouped strategies, shaders, m_subscribes.ts, m_timeline.ts
1156+
// TODO: used externally by grouped strategies, shaders, m_subscribes.ts, m_timeline.ts
11571157
_getGroupCount() {
11581158
return this.resourceManager.groupCount();
11591159
}
@@ -1361,18 +1361,18 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
13611361

13621362
protected getCellElementByPosition(cellCoordinates, groupIndex, inAllDayRow) {
13631363
const indexes = this._groupedStrategy.prepareCellIndexes(cellCoordinates, groupIndex, inAllDayRow);
1364-
return this.dom_getDateCell(indexes);
1364+
return this.domGetDateCell(indexes);
13651365
}
13661366

1367-
private dom_getDateCell(position) {
1367+
private domGetDateCell(position) {
13681368
return this._$dateTable
13691369
.find(`tr:not(.${VIRTUAL_ROW_CLASS})`)
13701370
.eq(position.rowIndex)
13711371
.find(`td:not(.${VIRTUAL_CELL_CLASS})`)
13721372
.eq(position.columnIndex);
13731373
}
13741374

1375-
private dom_getAllDayPanelCell(columnIndex) {
1375+
private domGetAllDayPanelCell(columnIndex) {
13761376
return this._$allDayPanel
13771377
.find('tr').eq(0)
13781378
.find('td').eq(columnIndex);
@@ -1938,8 +1938,8 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
19381938
}
19391939

19401940
return allDay && !this.isVerticalGroupedWorkSpace()
1941-
? this.dom_getAllDayPanelCell(position.columnIndex)
1942-
: this.dom_getDateCell(position);
1941+
? this.domGetAllDayPanelCell(position.columnIndex)
1942+
: this.domGetDateCell(position);
19431943
}
19441944

19451945
// Must replace all DOM manipulations
@@ -2023,7 +2023,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
20232023
}
20242024

20252025
// TODO: remove along with old render
2026-
private oldRender_getAllDayCellData(groupIndex) {
2026+
private oldRenderGetAllDayCellData(groupIndex) {
20272027
return (cell, rowIndex, columnIndex) => {
20282028
const validColumnIndex = columnIndex % this._getCellCount();
20292029
const options = this.getDateGenerationOptions(true);
@@ -2374,7 +2374,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
23742374
break;
23752375
case 'crossScrollingEnabled':
23762376
this.toggleHorizontalScrollClass();
2377-
this._dateTableScrollable.option(this._dateTableScrollableConfig());
2377+
this._dateTableScrollable.option(this.dateTableScrollableConfig());
23782378
break;
23792379
case 'allDayPanelMode':
23802380
this.updateShowAllDayPanel();
@@ -2447,8 +2447,8 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
24472447

24482448
_init() {
24492449
this.scrollSync = {};
2450-
this._viewDataProvider = null;
2451-
this._cellsSelectionState = null;
2450+
this.viewDataProviderValue = null;
2451+
this.cellsSelectionStateValue = null;
24522452

24532453
// @ts-expect-error
24542454
super._init();
@@ -2579,7 +2579,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
25792579
const $_dateTableScrollable = $('<div>').addClass(SCHEDULER_DATE_TABLE_SCROLLABLE_CLASS);
25802580

25812581
// @ts-expect-error
2582-
this._dateTableScrollable = this._createComponent($_dateTableScrollable, Scrollable, this._dateTableScrollableConfig());
2582+
this._dateTableScrollable = this._createComponent($_dateTableScrollable, Scrollable, this.dateTableScrollableConfig());
25832583
this.scrollSync.dateTable = getMemoizeScrollTo(() => this._dateTableScrollable);
25842584
}
25852585

@@ -3110,7 +3110,7 @@ class SchedulerWorkSpace extends Widget<WorkspaceOptionsInternal> {
31103110
rowClass: ALL_DAY_TABLE_ROW_CLASS,
31113111
cellTemplate: this.option('dataCellTemplate'),
31123112
// TODO: remove along with old render
3113-
getCellData: this.oldRender_getAllDayCellData(index),
3113+
getCellData: this.oldRenderGetAllDayCellData(index),
31143114
groupIndex: index,
31153115
}, true);
31163116

0 commit comments

Comments
 (0)