Skip to content

Commit fd68667

Browse files
r-farkhutdinovRuslan Farkhutdinov
andauthored
FileUploader: Remove "m" prefix (DevExpress#30743)
Co-authored-by: Ruslan Farkhutdinov <[email protected]>
1 parent a9f855e commit fd68667

File tree

2 files changed

+7
-29
lines changed

2 files changed

+7
-29
lines changed

packages/devextreme/js/__internal/ui/m_file_uploader.ts renamed to packages/devextreme/js/__internal/ui/file_uploader.ts

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ class FileBlobReader {
234234
};
235235
}
236236

237-
// eslint-disable-next-line class-methods-use-this
238237
sliceFile(file: File, startPos: number, length: number): Blob | null {
239238
if (file.slice) {
240239
return file.slice(startPos, startPos + length);
@@ -303,7 +302,7 @@ class FileUploadStrategyBase {
303302
file.request = xhr;
304303
}
305304

306-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
305+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
307306
_createUploadArgument(_file: FileUploaderItem): UploadChunkInfo {
308307
// This is an abstract method and should be implemented in subclasses.
309308
// Returning a default object to satisfy the return type.
@@ -316,7 +315,7 @@ class FileUploadStrategyBase {
316315
};
317316
}
318317

319-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
318+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
320319
_uploadCore(_file: FileUploaderItem): void {
321320
}
322321

@@ -335,7 +334,6 @@ class FileUploadStrategyBase {
335334
this._handleProgressCore(file, e);
336335
}
337336

338-
// eslint-disable-next-line class-methods-use-this
339337
_handleProgressCore(
340338
// eslint-disable-next-line @typescript-eslint/no-unused-vars
341339
_file: FileUploaderItem,
@@ -344,7 +342,6 @@ class FileUploadStrategyBase {
344342
): void {
345343
}
346344

347-
// eslint-disable-next-line class-methods-use-this
348345
_handleFileError(file: FileUploaderItem, error: unknown): void {
349346
file._isError = true;
350347
file.onError.fire(error);
@@ -372,7 +369,6 @@ class FileUploadStrategyBase {
372369
return (this._isStatusError(e.status) || !file._isProgressStarted) && !file.isAborted;
373370
}
374371

375-
// eslint-disable-next-line class-methods-use-this
376372
_isStatusError(status: number): boolean {
377373
return (status >= 400 && status < 500) || (status >= 500 && status < 600);
378374
}
@@ -454,7 +450,6 @@ class FileUploadStrategyBase {
454450
}
455451
}
456452

457-
// eslint-disable-next-line class-methods-use-this
458453
_getLoadedData(
459454
loaded: number,
460455
total: number,
@@ -544,7 +539,6 @@ class ChunksFileUploadStrategyBase extends FileUploadStrategyBase {
544539
}
545540
}
546541

547-
// eslint-disable-next-line class-methods-use-this
548542
_sendChunkCore(
549543
// eslint-disable-next-line @typescript-eslint/no-unused-vars
550544
_file: FileUploaderItem,
@@ -558,15 +552,14 @@ class ChunksFileUploadStrategyBase extends FileUploadStrategyBase {
558552
return Deferred().reject();
559553
}
560554

561-
// eslint-disable-next-line class-methods-use-this
562555
_tryRaiseStartLoad(file: FileUploaderItem): void {
563556
if (!file.isStartLoad) {
564557
file.isStartLoad = true;
565558
file.onLoadStart.fire();
566559
}
567560
}
568561

569-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
562+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
570563
_getEvent(_e: Event): null {
571564
return null;
572565
}
@@ -575,7 +568,6 @@ class ChunksFileUploadStrategyBase extends FileUploadStrategyBase {
575568
return this._createChunksInfo(file.chunksData);
576569
}
577570

578-
// eslint-disable-next-line class-methods-use-this
579571
_createChunksInfo(chunksData?: FileUploaderChunksData): UploadChunkInfo {
580572
return {
581573
bytesUploaded: chunksData?.loadedBytes ?? 0,
@@ -655,7 +647,7 @@ class CustomChunksFileUploadStrategy extends ChunksFileUploadStrategyBase {
655647
}
656648
}
657649

658-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
650+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
659651
_shouldHandleError(_file: FileUploaderItem, _error: unknown): boolean {
660652
return true;
661653
}
@@ -681,14 +673,13 @@ class WholeFileUploadStrategyBase extends FileUploadStrategyBase {
681673
}
682674
}
683675

684-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
676+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
685677
_uploadFile(_file: FileUploaderItem): PromiseLike<unknown> | DeferredObj<unknown> {
686678
// Abstract method: subclasses should override this.
687679
// Return a rejected Deferred to satisfy the return type.
688680
return Deferred().reject();
689681
}
690682

691-
// eslint-disable-next-line class-methods-use-this
692683
_handleProgressCore(
693684
file: FileUploaderItem,
694685
e: Event | { loaded?: number; total?: number },
@@ -760,7 +751,7 @@ class CustomWholeFileUploadStrategy extends WholeFileUploadStrategyBase {
760751
}
761752
}
762753

763-
// eslint-disable-next-line @typescript-eslint/no-unused-vars, class-methods-use-this
754+
// eslint-disable-next-line @typescript-eslint/no-unused-vars
764755
_shouldHandleError(_file: FileUploaderItem, _e: unknown): boolean {
765756
return true;
766757
}
@@ -1074,7 +1065,6 @@ class FileUploader extends Editor<FileUploaderProperties> {
10741065
this.option({ value: files?.concat(value) });
10751066
}
10761067

1077-
// eslint-disable-next-line class-methods-use-this
10781068
_getFiles(fileList: FileList): File[] {
10791069
return [...fileList];
10801070
}
@@ -1218,7 +1208,6 @@ class FileUploader extends Editor<FileUploaderProperties> {
12181208
return minFileSize > 0 ? fileSize >= minFileSize : true;
12191209
}
12201210

1221-
// eslint-disable-next-line class-methods-use-this
12221211
_isFileExtensionAllowed(file: File, allowedExtensions: string[]): boolean {
12231212
for (let i = 0, n = allowedExtensions.length; i < n; i += 1) {
12241213
let allowedExtension = allowedExtensions[i];
@@ -1276,7 +1265,6 @@ class FileUploader extends Editor<FileUploaderProperties> {
12761265
this._dropZoneLeaveAction = this._createActionByOption('onDropZoneLeave');
12771266
}
12781267

1279-
// eslint-disable-next-line class-methods-use-this
12801268
_createFile(value: File): FileUploaderItem {
12811269
return {
12821270
value,
@@ -1298,7 +1286,6 @@ class FileUploader extends Editor<FileUploaderProperties> {
12981286
};
12991287
}
13001288

1301-
// eslint-disable-next-line class-methods-use-this
13021289
_resetFileState(file: FileUploaderItem): void {
13031290
file.isAborted = false;
13041291
file.uploadStarted = false;
@@ -1531,12 +1518,10 @@ class FileUploader extends Editor<FileUploaderProperties> {
15311518
);
15321519
}
15331520

1534-
// eslint-disable-next-line class-methods-use-this
15351521
_hasInvalidFile(files: FileUploaderItem[]): boolean {
15361522
return files.some((file) => !file.isValid());
15371523
}
15381524

1539-
// eslint-disable-next-line class-methods-use-this
15401525
_getFileSize(size: number): string {
15411526
const labels = [
15421527
messageLocalization.format('dxFileUploader-bytes'),
@@ -1622,7 +1607,6 @@ class FileUploader extends Editor<FileUploaderProperties> {
16221607
);
16231608
}
16241609

1625-
// eslint-disable-next-line class-methods-use-this
16261610
_detachSelectFileDialogHandlers(target: FileDialogEventTarget): void {
16271611
if (!isDefined(target)) {
16281612
return;
@@ -2007,12 +1991,10 @@ class FileUploader extends Editor<FileUploaderProperties> {
20071991
this._setLoadedSize(totalLoadedFilesSize);
20081992
}
20091993

2010-
// eslint-disable-next-line class-methods-use-this
20111994
_getProgressValue(ratio: number): number {
20121995
return Math.floor(ratio * 100);
20131996
}
20141997

2015-
// eslint-disable-next-line class-methods-use-this
20161998
_initStatusMessage(file: FileUploaderItem): void {
20171999
file.$statusMessage?.css('display', 'none');
20182000
}
@@ -2120,7 +2102,6 @@ class FileUploader extends Editor<FileUploaderProperties> {
21202102
: (e as MouseEvent).clientY + this._getDocumentScrollTop();
21212103
}
21222104

2123-
// eslint-disable-next-line class-methods-use-this
21242105
_getTouchEventX(e: TouchEvent): number {
21252106
let touchPoint: TouchList | null = null;
21262107
if (e.changedTouches.length > 0) {
@@ -2131,7 +2112,6 @@ class FileUploader extends Editor<FileUploaderProperties> {
21312112
return touchPoint ? touchPoint[0].pageX : 0;
21322113
}
21332114

2134-
// eslint-disable-next-line class-methods-use-this
21352115
_getTouchEventY(e: TouchEvent): number {
21362116
let touchPoint: TouchList | null = null;
21372117
if (e.changedTouches.length > 0) {
@@ -2142,13 +2122,11 @@ class FileUploader extends Editor<FileUploaderProperties> {
21422122
return touchPoint ? touchPoint[0].pageY : 0;
21432123
}
21442124

2145-
// eslint-disable-next-line class-methods-use-this
21462125
_getDocumentScrollTop(): number {
21472126
const document = domAdapter.getDocument();
21482127
return document.documentElement.scrollTop || document.body.scrollTop;
21492128
}
21502129

2151-
// eslint-disable-next-line class-methods-use-this
21522130
_getDocumentScrollLeft(): number {
21532131
const document = domAdapter.getDocument();
21542132
return document.documentElement.scrollLeft || document.body.scrollLeft;

packages/devextreme/js/ui/file_uploader.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import FileUploader from '../__internal/ui/m_file_uploader';
1+
import FileUploader from '../__internal/ui/file_uploader';
22

33
export default FileUploader;
44

0 commit comments

Comments
 (0)