From 9cfe322dd545fd457d4ef097fea1d1d542e1ed0f Mon Sep 17 00:00:00 2001 From: Jared Date: Wed, 9 Sep 2020 16:51:31 -0700 Subject: [PATCH] Fix device grid buttons. --- Desktop.Win/Services/ShutdownServiceWin.cs | 3 +-- Server/wwwroot/scripts/Main/DataGrid.js | 12 +++++++----- Server/wwwroot/scripts/Main/DataGrid.js.map | 2 +- Server/wwwroot/scripts/Main/DataGrid.ts | 14 +++++++++----- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/Desktop.Win/Services/ShutdownServiceWin.cs b/Desktop.Win/Services/ShutdownServiceWin.cs index ed576ed5..b01ea218 100644 --- a/Desktop.Win/Services/ShutdownServiceWin.cs +++ b/Desktop.Win/Services/ShutdownServiceWin.cs @@ -20,8 +20,7 @@ namespace Remotely.Desktop.Win.Services await casterSocket.DisconnectAllViewers(); System.Windows.Forms.Application.Exit(); App.Current.Shutdown(); - // TODO: Still needed? - //Environment.Exit(0); + Environment.Exit(0); } } } diff --git a/Server/wwwroot/scripts/Main/DataGrid.js b/Server/wwwroot/scripts/Main/DataGrid.js index c6b36384..3dfc2b92 100644 --- a/Server/wwwroot/scripts/Main/DataGrid.js +++ b/Server/wwwroot/scripts/Main/DataGrid.js @@ -83,8 +83,8 @@ export function RenderDeviceRows() { var endCurrentDevices = startCurrentDevices + GridState.RowsPerPage; var currentPageDevices = FilteredDevices.slice(startCurrentDevices, endCurrentDevices); for (var i = 0; i < currentPageDevices.length; i++) { - var device = currentPageDevices[i]; - var recordRow = document.getElementById(device.ID); + let device = currentPageDevices[i]; + let recordRow = document.getElementById(device.ID); if (recordRow == null) { recordRow = document.createElement("tr"); recordRow.classList.add("record-row"); @@ -102,9 +102,11 @@ export function RenderDeviceRows() { }); } recordRow.innerHTML = ` - ${String(device.IsOnline) - .replace("true", "") - .replace("false", "")} + + ${device.IsOnline ? + "" : + ""} + ${device.DeviceName} ${device.Alias || ""} ${device.CurrentUser} diff --git a/Server/wwwroot/scripts/Main/DataGrid.js.map b/Server/wwwroot/scripts/Main/DataGrid.js.map index 498ff034..95edef24 100644 --- a/Server/wwwroot/scripts/Main/DataGrid.js.map +++ b/Server/wwwroot/scripts/Main/DataGrid.js.map @@ -1 +1 @@ -{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"DataGrid.js","sourceRoot":"","sources":["DataGrid.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/Server/wwwroot/scripts/Main/DataGrid.ts b/Server/wwwroot/scripts/Main/DataGrid.ts index e6950c5c..0c3d2b41 100644 --- a/Server/wwwroot/scripts/Main/DataGrid.ts +++ b/Server/wwwroot/scripts/Main/DataGrid.ts @@ -104,9 +104,9 @@ export function RenderDeviceRows() { var currentPageDevices = FilteredDevices.slice(startCurrentDevices, endCurrentDevices); for (var i = 0; i < currentPageDevices.length; i++) { + let device = currentPageDevices[i]; + let recordRow = document.getElementById(device.ID) as HTMLTableRowElement; - var device = currentPageDevices[i]; - var recordRow = document.getElementById(device.ID) as HTMLTableRowElement; if (recordRow == null) { recordRow = document.createElement("tr"); recordRow.classList.add("record-row"); @@ -125,9 +125,13 @@ export function RenderDeviceRows() { } recordRow.innerHTML = ` - ${String(device.IsOnline) - .replace("true", "") - .replace("false", "")} + + ${ + device.IsOnline ? + "" : + "" + } + ${device.DeviceName} ${device.Alias || ""} ${device.CurrentUser}