Bug fix when updating tags via grid. Added Linux GUI to downloads page.

immense · May 10, 2019 · 02ea46d · 02ea46d
1 parent 9f5e25d
commit 02ea46d
Show file tree

Hide file tree

Showing 11 changed files with 106 additions and 132 deletions.
diff --git a/Remotely_Desktop.Unix/Remotely_Desktop.Unix.csproj b/Remotely_Desktop.Unix/Remotely_Desktop.Unix.csproj
@@ -38,7 +38,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Remotely_ScreenCast.Core\Remotely_ScreenCast.Core.csproj" />
     <ProjectReference Include="..\Remotely_ScreenCast.Linux\Remotely_ScreenCast.Linux.csproj" />
-    <ProjectReference Include="..\Remotely_ScreenCast.Win\Remotely_ScreenCast.Win.csproj" />
     <ProjectReference Include="..\Remotely_Shared\Remotely_Shared.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Remotely_Desktop.Unix/ViewModels/MainWindowViewModel.cs b/Remotely_Desktop.Unix/ViewModels/MainWindowViewModel.cs
@@ -10,8 +10,6 @@
 using Remotely_ScreenCast.Core.Utilities;
 using Remotely_ScreenCast.Linux.Capture;
 using Remotely_ScreenCast.Linux.Input;
-using Remotely_ScreenCast.Win.Capture;
-using Remotely_ScreenCast.Win.Input;
 using Remotely_Shared.Models;
 using Remotely_Shared.Services;
 using System;
@@ -157,10 +155,6 @@ public async Task Init()
             {
                 Conductor.SetMessageHandlers(new X11Input());
             }
-            else if (OSUtils.IsWindows)
-            {
-                Conductor.SetMessageHandlers(new WinInput());
-            }
 
             await Conductor.CasterSocket.SendDeviceInfo(Conductor.ServiceID, Environment.MachineName);
             await Conductor.CasterSocket.GetSessionID();
@@ -205,17 +199,6 @@ private void ScreenCastRequested(object sender, ScreenCastRequest screenCastRequ
                         {
                             capturer = new X11Capture();
                         }
-                        else if (OSUtils.IsWindows)
-                        {
-                            if (Conductor.Viewers.Count == 0)
-                            {
-                                capturer = new DXCapture();
-                            }
-                            else
-                            {
-                                capturer = new BitBltCapture();
-                            }
-                        }
 
                         await Conductor.CasterSocket.SendCursorChange(new CursorInfo(null, Point.Empty, "default"), new List<string>() { screenCastRequest.ViewerID });
                         ScreenCaster.BeginScreenCasting(screenCastRequest.ViewerID, screenCastRequest.RequesterName, capturer, Conductor);

diff --git a/Remotely_Server/CurrentVersion.txt b/Remotely_Server/CurrentVersion.txt
@@ -1 +1 @@
-2019.05.03.1003
+2019.05.09.2205
diff --git a/Remotely_Server/Pages/Clients.cshtml b/Remotely_Server/Pages/Clients.cshtml
@@ -36,21 +36,21 @@
         Instant desktop sharing with no installation or hassles.
     </div>
     <div class="col-sm-6">
-        <h6 class="font-weight-bold">Windows</h6>
+        <h6 class="font-weight-bold">Windows (32/64-Bit)</h6>
         <p>
             <strong>Download:</strong>
             <br />
             <a href="~/Downloads/Remotely_Desktop.exe">Windows Portable EXE</a>
         </p>
     </div>
-    @*<div class="col-sm-6">
-        <h6 class="font-weight-bold">Windows 32-Bit</h6>
+    <div class="col-sm-6">
+        <h6 class="font-weight-bold">Linux 64-Bit</h6>
         <p>
             <strong>Download:</strong>
             <br />
-            <a href="~/Downloads/Remotely_ScreenCast.exe">Windows x86 Portable EXE</a>
+            <a href="~/Downloads/Remotely_Desktop.Unix.zip">Linux Zipped</a>
         </p>
-    </div>*@
+    </div>
 </div>
 
 <div class="row">

diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.js.map
diff --git a/Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts b/Remotely_Server/wwwroot/scripts/Commands/WebCommands.ts
@@ -440,7 +440,9 @@ var commands: Array<ConsoleCommand> = [
                     parameterDict["tags"] = x.Tags.trim() + separator + parameterDict["tags"]
                 }
                 DataGrid.DataSource.find(y => y.ID == x.ID).Tags = parameterDict["tags"];
-                (document.getElementById(x.ID).querySelector(".device-tag") as HTMLInputElement).value = parameterDict["tags"];
+                var deviceTagInput = document.getElementById(x.ID).querySelector(".device-tag") as HTMLInputElement;
+                deviceTagInput.value = parameterDict["tags"];
+                deviceTagInput.setAttribute("value", parameterDict["tags"]);
                 BrowserSockets.Connection.invoke("UpdateTags", x.ID, parameterDict["tags"]);
             });
         }

diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.js b/Remotely_Server/wwwroot/scripts/DataGrid.js
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.js.map b/Remotely_Server/wwwroot/scripts/DataGrid.js.map
diff --git a/Remotely_Server/wwwroot/scripts/DataGrid.ts b/Remotely_Server/wwwroot/scripts/DataGrid.ts
@@ -51,6 +51,9 @@ export function AddOrUpdateDevice(device: Device) {
     (recordRow.querySelector(".device-tag") as HTMLInputElement).onchange = (ev) => {
         var newTag = (ev.currentTarget as HTMLInputElement).value;
         DataSource.find(x => x.ID == device.ID).Tags = newTag;
+        var deviceTagInput = document.getElementById(device.ID).querySelector(".device-tag") as HTMLInputElement;
+        deviceTagInput.value = newTag;
+        deviceTagInput.setAttribute("value", newTag);
         BrowserSockets.Connection.invoke("UpdateTags", device.ID, newTag);
     };
     UpdateDeviceCounts();