ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-01-15 09:20:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into master-3.0

Browse Source 
# 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
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/components/project-map/new-template-dialog/new-template-dialog.component.ts
View File

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