MyFavMirrors/MeshCentral
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshCentral.git synced 2025-02-25 04:19:11 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed multi-display selector in web app.

Browse Source
This commit is contained in:
Ylian Saint-Hilaire 2019-04-27 10:44:57 -07:00
parent ead301a557
commit 903a8796b3
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "meshcentral", "name": "meshcentral",
"version": "0.3.3-b", "version": "0.3.3-c",
"keywords": [ "keywords": [
"Remote Management", "Remote Management",
"Intel AMT", "Intel AMT",

2
views/default-min.handlebars
View File

File diff suppressed because one or more lines are too long

8
views/default.handlebars
View File

@ -4481,6 +4481,7 @@
deskFocusBtn.value = 'All Focus'; deskFocusBtn.value = 'All Focus';
if (fullscreen == true) { deskToggleFull(); } if (fullscreen == true) { deskToggleFull(); }
webRtcDesktopReset(); webRtcDesktopReset();
deskPreferedStickyDisplay = 0;
break; break;
case 2: case 2:
break; break;
@ -4778,17 +4779,20 @@
Q("Desk")['toBlob'](function (blob) { saveAs(blob, n + ".jpg"); }); 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; var txt = Q('termdisplays').value;
if (info.length > 0) { var options = ''; for (var x in info) { options += '<option' + ((txt == info[x])?' selected':'') + '>' + info[x] + '</option>'; } QH('termdisplays', options); } if (info.length > 0) { var options = ''; for (var x in info) { options += '<option' + ((selDisplay == x) ? ' selected' : '') + '>' + info[x] + '</option>'; } QH('termdisplays', options); }
QV('termdisplays', info.length > 1); QV('termdisplays', info.length > 1);
if ((deskPreferedStickyDisplay != selDisplay) && (info.length > deskPreferedStickyDisplay)) { desktop.m.SetDisplay(deskPreferedStickyDisplay); }
} }
function deskGetDisplayNumbers(e) { desktop.m.GetDisplayNumbers(); } function deskGetDisplayNumbers(e) { desktop.m.GetDisplayNumbers(); }
var deskPreferedStickyDisplay = 0;
function deskSetDisplay(e) { function deskSetDisplay(e) {
var display = 0, txt = Q('termdisplays').value; var display = 0, txt = Q('termdisplays').value;
if (txt == "All Displays") display = 65535; else display = parseInt(txt.substring(8)); if (txt == "All Displays") display = 65535; else display = parseInt(txt.substring(8));
deskPreferedStickyDisplay = display;
desktop.m.SetDisplay(display); desktop.m.SetDisplay(display);
} }