Merge branch 'daniel' of https://gitlab.psi.ch/samenv/seweb into daniel
# Conflicts: # client/jsFiles/SEAWebClientMain.js
This commit is contained in:
@ -72,12 +72,18 @@ function handleUpdateMessage(src, message) {
|
||||
clientID = message.id;
|
||||
if ("device" in message) {
|
||||
if (message.device == "_inst_select") {
|
||||
clientTitle = "select instrument";
|
||||
window.clientTitle = "select instrument";
|
||||
console.log('IDselect')
|
||||
pushInitCommand("getblock?path=_inst_select&", "instrument selection");
|
||||
sizeChange();
|
||||
} else {
|
||||
clientTitle = message.instrument + " " + message.device;
|
||||
if (message.instrument) {
|
||||
window.instrument = message.instrument;
|
||||
}
|
||||
if (message.device) {
|
||||
window.device = message.device;
|
||||
}
|
||||
window.clientTitle = window.instrument + " " + window.device;
|
||||
// console.log('loadBlocks', message);
|
||||
loadFirstBlocks();
|
||||
}
|
||||
|
Reference in New Issue
Block a user