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

fix: undefined vars / resizable / upload 

* was brokend by refacto
This commit is contained in:
Florent Chehab 2020-04-19 17:57:54 +02:00
parent 39e8dd398b
commit d5cb969ee5
No known key found for this signature in database
GPG Key ID: 9A0CE018889EA246
4 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/server-frontend-dev.js
View File

@ -7,6 +7,7 @@ const devServerConfig = {
},
proxy: {
'/api': 'http://localhost:3000',
'/uploads': 'http://localhost:3000',
'/ws-api': {
target: 'ws://localhost:3000',
ws: true,

1
src/js/index.js
View File

@ -1,5 +1,6 @@
import "jquery-ui/ui/core";
import "jquery-ui/ui/widgets/draggable";
import "jquery-ui/ui/widgets/resizable";
import "../css/main.css";
import "./icons";

4
src/js/main.js
View File

@ -469,7 +469,7 @@ function main(){
var reader = new window.FileReader();
reader.readAsDataURL(blob);
reader.onloadend = function () {
base64data = reader.result;
const base64data = reader.result;
uploadImgAndAddToWhiteboard(base64data);
}
} else {
@ -651,7 +651,7 @@ function main(){
options[i] = newOptions[i];
}
}
var alertHtml = $('<div class="basicalert" style="position:absolute; top:0px; left:0px; width:100%; top:70px; font-family: monospace;">' +
var alertHtml = $('<div class="basicalert" style="position:absolute; left:0px; width:100%; top:70px; font-family: monospace;">' +
'<div style="width: 30%; margin: auto; background: #aaaaaa; border-radius: 5px; font-size: 1.2em; border: 1px solid gray;">' +
'<div style="border-bottom: 1px solid #676767; background: ' + options["headercolor"] + '; padding-left: 5px; font-size: 0.8em;">' + options["header"] + '</div>' +
'<div style="padding: 10px;" class="htmlcontent"></div>' +

2
src/js/whiteboard.js
View File

@ -45,7 +45,7 @@ const whiteboard = {
this.settings["whiteboardId"] = this.settings["whiteboardId"].replace(/[^0-9a-z]/gi, '');
//background grid (repeating image) and smallest screen indication
_this.backgroundGrid = $('<div style="position: absolute; left:0px; top:0; opacity: 0.2; background-image:url(\'' + _this.settings["backgroundGridUrl"] + '\'); height: 100%; width: 100%;"></div>');
_this.backgroundGrid = $(`<div style="position: absolute; left:0px; top:0; opacity: 0.2; background-image:url('${_this.settings["backgroundGridUrl"]}'); height: 100%; width: 100%;"></div>`);
// container for background images
_this.imgContainer = $('<div style="position: absolute; left:0px; top:0; height: 100%; width: 100%;"></div>');
// whiteboard canvas