From 8a45dd185de99b65a74a09acf5e45befec9daff6 Mon Sep 17 00:00:00 2001 From: Ylian Saint-Hilaire Date: Sat, 27 Apr 2019 10:44:57 -0700 Subject: [PATCH] Fixed multi-display selector in web app. --- package.json | 2 +- views/default-min.handlebars | 2 +- views/default.handlebars | 8 ++++++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index df6c3f27..c6f51d7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "meshcentral", - "version": "0.3.3-b", + "version": "0.3.3-c", "keywords": [ "Remote Management", "Intel AMT", diff --git a/views/default-min.handlebars b/views/default-min.handlebars index 45241dcd..d5178c08 100644 --- a/views/default-min.handlebars +++ b/views/default-min.handlebars @@ -1 +1 @@ - {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file + {{{title}}}
{{{title}}}
{{{title2}}}

{{{logoutControl}}}

♦
 

\ No newline at end of file diff --git a/views/default.handlebars b/views/default.handlebars index 8eb00f07..2c4e39b7 100644 --- a/views/default.handlebars +++ b/views/default.handlebars @@ -4481,6 +4481,7 @@ deskFocusBtn.value = 'All Focus'; if (fullscreen == true) { deskToggleFull(); } webRtcDesktopReset(); + deskPreferedStickyDisplay = 0; break; case 2: break; @@ -4778,17 +4779,20 @@ Q("Desk")['toBlob'](function (blob) { saveAs(blob, n + ".jpg"); }); } - function deskDisplayInfo(sender, info, selDisplay, selItem) { + function deskDisplayInfo(sender, info, selDisplay) { var txt = Q('termdisplays').value; - if (info.length > 0) { var options = ''; for (var x in info) { options += '' + info[x] + ''; } QH('termdisplays', options); } + if (info.length > 0) { var options = ''; for (var x in info) { options += '' + info[x] + ''; } QH('termdisplays', options); } QV('termdisplays', info.length > 1); + if ((deskPreferedStickyDisplay != selDisplay) && (info.length > deskPreferedStickyDisplay)) { desktop.m.SetDisplay(deskPreferedStickyDisplay); } } function deskGetDisplayNumbers(e) { desktop.m.GetDisplayNumbers(); } + var deskPreferedStickyDisplay = 0; function deskSetDisplay(e) { var display = 0, txt = Q('termdisplays').value; if (txt == "All Displays") display = 65535; else display = parseInt(txt.substring(8)); + deskPreferedStickyDisplay = display; desktop.m.SetDisplay(display); }