WebDev
/
VersaWhiteboard
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

show error messages on the screen instead of the console + bugfix for some img urls

This commit is contained in:
cracker0dks 2019-06-05 00:55:48 +02:00
parent d48f0bf74c
commit a7c02ac47f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
public/js/main.js
View File

@ -244,7 +244,6 @@ $(document).ready(function () {
if (e.originalEvent.dataTransfer.files.length) { //File from harddisc
e.preventDefault();
e.stopPropagation();
var filename = e.originalEvent.dataTransfer.files[0]["name"];
if (isImageFileName(filename)) {
var blob = e.originalEvent.dataTransfer.files[0];
@ -255,9 +254,10 @@ $(document).ready(function () {
uploadImgAndAddToWhiteboard(base64data);
}
} else {
console.error("File must be an image!");
showBasicAlert("File must be an image!");
}
} else { //File from other browser
var fileUrl = e.originalEvent.dataTransfer.getData('URL');
var imageUrl = e.originalEvent.dataTransfer.getData('text/html');
var rex = /src="?([^"\s]+)"?\s*/;
@ -274,13 +274,13 @@ $(document).ready(function () {
} else {
isValidImageUrl(url, function (isImage) {
if (isImage) {
if (isImageFileName(url)) {
if (isImageFileName(url) || url.startsWith("http")) {
whiteboard.addImgToCanvasByUrl(url);
} else {
uploadImgAndAddToWhiteboard(url);
uploadImgAndAddToWhiteboard(url); //Last option maybe its base64
}
} else {
console.error("Can only upload imagedata!");
showBasicAlert("Can only upload Imagedata!");
}
});
}
@ -325,7 +325,7 @@ function uploadImgAndAddToWhiteboard(base64data) {
console.log("Image uploaded!");
},
error: function (err) {
console.error("Failed to upload frame: " + JSON.stringify(err));
showBasicAlert("Failed to upload frame: " + JSON.stringify(err));
}
});
}