@@ -29,7 +29,7 @@ const options = {
29
29
const adobeClientID = "STATIC_CLIENT_ID" ;
30
30
const appMajorVer = 3 ;
31
31
const appMinorVer = 4 ;
32
- const appPatchVer = 3 ;
32
+ const appPatchVer = 4 ;
33
33
const apiUrl = "http://192.168.0.2" ;
34
34
const bearerToken = "STATIC_BEARER" ;
35
35
const errModal = new Modal ( $errModal , options ) ;
@@ -242,6 +242,9 @@ if (uploadDropzone) {
242
242
let uploadDropzone = new Dropzone ( "#dropzoneArea" , {
243
243
url : `${ apiUrl } /api/v1/file/upload` ,
244
244
paramName : "file" ,
245
+ renameFile : function ( file ) {
246
+ return fileNameFormat ( fileNameFormat ( file . name ) ) ;
247
+ } ,
245
248
maxFilesize : 25 ,
246
249
maxFiles : 5 ,
247
250
acceptedFiles : "application/pdf" ,
@@ -443,7 +446,7 @@ if (uploadDropzone) {
443
446
}
444
447
445
448
if ( file ) {
446
- const filePath = uploadPath + file . name ;
449
+ const filePath = uploadPath + fileNameFormat ( file . name ) ;
447
450
448
451
if ( xhrScsUploads > 0 ) {
449
452
let dzErrorMessage =
@@ -454,7 +457,7 @@ if (uploadDropzone) {
454
457
xhrScsUploads = xhrScsUploads - 1 ;
455
458
}
456
459
uploadedFile = uploadedFile . filter (
457
- ( item ) => ! file . name . includes ( item )
460
+ ( item ) => ! fileNameFormat ( file . name ) . includes ( item )
458
461
) ;
459
462
}
460
463
@@ -488,7 +491,7 @@ if (uploadDropzone) {
488
491
} ) ;
489
492
490
493
this . on ( "success" , function ( response ) {
491
- var uploadedFileName = response . name ;
494
+ var uploadedFileName = fileNameFormat ( response . name ) ;
492
495
uploadedFile . push ( uploadedFileName ) ;
493
496
494
497
xhrScsUploads = xhrScsUploads + 1 ;
@@ -534,7 +537,7 @@ if (uploadDropzone) {
534
537
this . on ( "timeout" , function ( file ) {
535
538
uploadDropzone . removeFile ( file ) ;
536
539
uploadedFile = uploadedFile . filter (
537
- ( item ) => ! file . name . includes ( item )
540
+ ( item ) => ! fileNameFormat ( file . name ) . includes ( item )
538
541
) ;
539
542
errMessage . innerText = "Connection timeout !" ;
540
543
errSubMessage . innerText = "Please try again later" ;
@@ -571,6 +574,9 @@ if (uploadDropzoneAlt) {
571
574
let uploadDropzoneAlt = new Dropzone ( "#dropzoneAreaCnv" , {
572
575
url : `${ apiUrl } /api/v1/file/upload` ,
573
576
paramName : "file" ,
577
+ renameFile : function ( file ) {
578
+ return fileNameFormat ( file . name ) ;
579
+ } ,
574
580
maxFilesize : 25 ,
575
581
maxFiles : 5 ,
576
582
acceptedFiles : ".xlsx, .xls, .ppt, .pptx, .docx, .doc, image/*" ,
@@ -750,7 +756,7 @@ if (uploadDropzoneAlt) {
750
756
}
751
757
752
758
if ( file ) {
753
- const filePath = uploadPath + file . name ;
759
+ const filePath = uploadPath + fileNameFormat ( file . name ) ;
754
760
755
761
if ( xhrScsUploads > 0 ) {
756
762
let dzErrorMessage =
@@ -761,7 +767,7 @@ if (uploadDropzoneAlt) {
761
767
xhrScsUploads = xhrScsUploads - 1 ;
762
768
}
763
769
uploadedFile = uploadedFile . filter (
764
- ( item ) => ! file . name . includes ( item )
770
+ ( item ) => ! fileNameFormat ( file . name ) . includes ( item )
765
771
) ;
766
772
}
767
773
@@ -795,7 +801,7 @@ if (uploadDropzoneAlt) {
795
801
} ) ;
796
802
797
803
this . on ( "success" , function ( file ) {
798
- var uploadedFileName = file . name ;
804
+ var uploadedFileName = fileNameFormat ( file . name ) ;
799
805
uploadedFile . push ( uploadedFileName ) ;
800
806
801
807
xhrScsUploads = xhrScsUploads + 1 ;
@@ -807,7 +813,7 @@ if (uploadDropzoneAlt) {
807
813
}
808
814
809
815
if ( ! file . type . startsWith ( "image/" ) ) {
810
- generateThumbnail ( file . name )
816
+ generateThumbnail ( fileNameFormat ( file . name ) )
811
817
. then ( function ( thumbnailURL ) {
812
818
file . previewElement
813
819
. querySelector ( "#loadingThumbnail" )
@@ -881,7 +887,7 @@ if (uploadDropzoneAlt) {
881
887
882
888
this . on ( "thumbnail" , function ( file ) {
883
889
if ( file . type . startsWith ( "image/" ) ) {
884
- getTemporaryURL ( file . name )
890
+ getTemporaryURL ( fileNameFormat ( file . name ) )
885
891
. then ( function ( temporaryURL ) {
886
892
file . previewElement
887
893
. querySelector ( "#loadingThumbnail" )
@@ -919,7 +925,7 @@ if (uploadDropzoneAlt) {
919
925
this . on ( "timeout" , function ( file ) {
920
926
uploadDropzoneAlt . removeFile ( file ) ;
921
927
uploadedFile = uploadedFile . filter (
922
- ( item ) => ! file . name . includes ( item )
928
+ ( item ) => ! fileNameFormat ( file . name ) . includes ( item )
923
929
) ;
924
930
file . previewElement
925
931
. querySelector ( "#loadingThumbnail" )
@@ -956,6 +962,9 @@ if (uploadDropzoneSingle) {
956
962
let uploadDropzoneSingle = new Dropzone ( "#dropzoneAreaSingle" , {
957
963
url : `${ apiUrl } /api/v1/file/upload` ,
958
964
paramName : "file" ,
965
+ renameFile : function ( file ) {
966
+ return fileNameFormat ( file . name ) ;
967
+ } ,
959
968
maxFilesize : 25 ,
960
969
maxFiles : 1 ,
961
970
acceptedFiles : "application/pdf" ,
@@ -1154,7 +1163,7 @@ if (uploadDropzoneSingle) {
1154
1163
}
1155
1164
1156
1165
if ( file ) {
1157
- const filePath = uploadPath + file . name ;
1166
+ const filePath = uploadPath + fileNameFormat ( file . name ) ;
1158
1167
1159
1168
if ( xhrScsUploads > 0 ) {
1160
1169
let dzErrorMessage =
@@ -1165,7 +1174,7 @@ if (uploadDropzoneSingle) {
1165
1174
xhrScsUploads = xhrScsUploads - 1 ;
1166
1175
}
1167
1176
uploadedFile = uploadedFile . filter (
1168
- ( item ) => ! file . name . includes ( item )
1177
+ ( item ) => ! fileNameFormat ( file . name ) . includes ( item )
1169
1178
) ;
1170
1179
}
1171
1180
@@ -1199,7 +1208,7 @@ if (uploadDropzoneSingle) {
1199
1208
} ) ;
1200
1209
1201
1210
this . on ( "success" , function ( response ) {
1202
- var uploadedFileName = response . name ;
1211
+ var uploadedFileName = fileNameFormat ( response . name ) ;
1203
1212
uploadedFile . push ( uploadedFileName ) ;
1204
1213
1205
1214
xhrScsUploads = xhrScsUploads + 1 ;
@@ -1244,7 +1253,7 @@ if (uploadDropzoneSingle) {
1244
1253
this . on ( "timeout" , function ( file ) {
1245
1254
uploadDropzoneSingle . removeFile ( file ) ;
1246
1255
uploadedFile = uploadedFile . filter (
1247
- ( item ) => ! file . name . includes ( item )
1256
+ ( item ) => ! fileNameFormat ( file . name ) . includes ( item )
1248
1257
) ;
1249
1258
errMessage . innerText = "Connection timeout !" ;
1250
1259
errSubMessage . innerText = "Please try again later" ;
@@ -1444,7 +1453,9 @@ function fetchVersion() {
1444
1453
1445
1454
function fileNameFormat ( fileName ) {
1446
1455
let trimmedFileName = fileName . trim ( ) ;
1447
- let newFileName = trimmedFileName . replace ( / \s + / g, "_" ) ;
1456
+ let newFileName = trimmedFileName
1457
+ . replace ( / [ ^ \w . ] + / g, "_" )
1458
+ . replace ( / _ + / g, "_" ) ;
1448
1459
1449
1460
return newFileName ;
1450
1461
}
0 commit comments