Merge pull request #66 from qJake/project-updates

Fixed JS path
qJake · Feb 10, 2020 · 6211584 · 6211584
2 parents 4aa7477 + e304fc5
commit 6211584
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 1 deletion.
diff --git a/HADotNet.CommandCenter/wwwroot/js/HAConnection.ts b/HADotNet.CommandCenter/wwwroot/js/HAConnection.ts
@@ -316,6 +316,11 @@ class HAConnection
 
     private parseSocketUrl(baseUrl: string): string
     {
+        if (/core\/websocket/i.test(baseUrl))
+        {
+            return baseUrl;
+        }
+
         let aTag = document.createElement('a');
         aTag.href = baseUrl;
 

diff --git a/HADotNet.CommandCenter/wwwroot/js/app.js b/HADotNet.CommandCenter/wwwroot/js/app.js
@@ -245,6 +245,9 @@ class HAConnection {
         }
     }
     parseSocketUrl(baseUrl) {
+        if (/core\/websocket/i.test(baseUrl)) {
+            return baseUrl;
+        }
         let aTag = document.createElement('a');
         aTag.href = baseUrl;
         return `${(aTag.protocol.toLowerCase() === 'https:' ? 'wss' : 'ws')}://${aTag.host}/api/websocket`;