Some esponsivity bugfixes
This commit is contained in:
@ -2,7 +2,7 @@
|
||||
// % COMMUNICATION
|
||||
|
||||
// local debugging: print the name of every executed funtion to the console
|
||||
var debug_communication_daniel = 0
|
||||
var debug_communication_daniel = 0;
|
||||
|
||||
var timeoutID; // We need this ID to reset the timer every 30 seconds
|
||||
|
||||
@ -274,7 +274,7 @@ function reqJSON(s, url, successHandler, errorHandler) {
|
||||
: new ActiveXObject('Microsoft.XMLHTTP');
|
||||
if (debugCommunication) {
|
||||
console.log("%cto server (reqJSON): %s",
|
||||
"color:white;background:lightgreen", url);
|
||||
"color:white;background:darkgreen", url);
|
||||
}
|
||||
xhr.open('get', url, true);
|
||||
xhr.onreadystatechange = function() {
|
||||
@ -337,18 +337,16 @@ function successHandler(s, message) {
|
||||
console.log("%cfrom server (reqJSON): " + message.type,
|
||||
"color:white;background:dimgray", message);
|
||||
}
|
||||
// console.log('CASE: ',message.type,', message: ',message);
|
||||
switch (message.type) {
|
||||
// Response to a "getblock"-server-request.
|
||||
case "draw":
|
||||
if (debugCommunication) {
|
||||
console.log(message);
|
||||
}
|
||||
if (message.path == "main") {
|
||||
// Happens only initially or at device change.
|
||||
for (var sLocal = 0; sLocal < 2; sLocal++) { // was up to MAXBLOCK
|
||||
insertSlide(sLocal, message.title, "main", createContent(
|
||||
sLocal, message));
|
||||
}
|
||||
// for (var sLocal = 0; sLocal < 2; sLocal++) { // was up to MAXBLOCK
|
||||
// insertSlide(sLocal, message.title, "main", createContent(sLocal, message));
|
||||
// }
|
||||
insertSlide(1, message.title, "main", createContent(1, message));
|
||||
insertSlide(2, "", "parameters", createContent(2, {components:[]}));
|
||||
} else {
|
||||
if (message.path == '_overview') {
|
||||
@ -358,18 +356,19 @@ function successHandler(s, message) {
|
||||
// In the module-block a parameter was selected
|
||||
// -> write parameter-block to grid-element2
|
||||
|
||||
console.log ('col',nColumns);
|
||||
isl = insertSlide(2, message.title, 'parameters', createContent(sLocal, message));
|
||||
if (nColumns < 2) {
|
||||
showParams = true;
|
||||
isl = insertSlide(2, message.title, 'parameters', createContent(2, message));
|
||||
if (nColumns == 1) {
|
||||
elements[1].style.display = "none"; // hide modules
|
||||
elements[2].style.display = "inline-block"; // show parameters
|
||||
} else if (nColumns == 2 || nColumns == 3) {
|
||||
elements[1].style.display = "none"; // hide modules
|
||||
elements[2].style.display = "inline-block"; // show parameters
|
||||
elements[2].style.width = "50vw"; //
|
||||
if (nRows > 1) {
|
||||
elements[2].style.height = "50vh"; //
|
||||
}
|
||||
// elements[1].style.display = "none"; // hide modules
|
||||
// elements[2].style.display = "inline-block"; // show parameters
|
||||
// // elements[2].style.width = "50vw"; //
|
||||
// if (nRows > 1) {
|
||||
// elements[2].style.height = "50vh"; //
|
||||
// }
|
||||
adjustGrid();
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -387,8 +386,7 @@ function successHandler(s, message) {
|
||||
// Response to a "console"-server-request.
|
||||
case "accept-console":
|
||||
// draw console only to the last grid-element
|
||||
insertSlide(3, "console", "console",
|
||||
createContentConsole(sLocal));
|
||||
insertSlide(3, "console", "console",createContentConsole(3));
|
||||
nextInitCommand();
|
||||
// send empty command in order to trigger getting history
|
||||
reqJSON(0, "http://" + hostPort + "/sendcommand?command=&id=" + clientID, successHandler,
|
||||
@ -405,7 +403,7 @@ function successHandler(s, message) {
|
||||
begin = timeRange[0] - timeRange[1];
|
||||
select.value = begin;
|
||||
// Server-request for variable-list.*/
|
||||
console.log('TIME', timeRange)
|
||||
// console.log('TIME', timeRange)
|
||||
reqJSONPOST(0, "http://" + hostPort + "/getvars",
|
||||
"time=" + timeRange[0] + ',' + timeRange[1]
|
||||
+ "&userconfiguration=" + JSON.stringify(getFormattedUserConfigurationFromLocalStorage())
|
||||
|
Reference in New Issue
Block a user