Merge branch '2.2' into master-3.0

# Conflicts:
#	package.json
This commit is contained in:
grossmj 2024-04-03 17:55:07 +07:00
commit 66b88c288d
No known key found for this signature in database
GPG Key ID: 0A2D76AC45EA25CD

View File

@ -393,7 +393,8 @@ export class NewTemplateDialogComponent implements OnInit {
this.uploaderImage.uploadItem(itemToUpload);
};
fileReader.readAsText(file);
//fileReader.readAsText(file); //web browser out ouf memory when upload large image file
fileReader.onloadend(undefined);
}
cancelUploading() {