From 4272eeabf7d6e174d3cacb86919f2f154e6b53dc Mon Sep 17 00:00:00 2001
From: Simon Li <spli@dundee.ac.uk>
Date: Mon, 29 Mar 2021 22:28:16 +0100
Subject: [PATCH] Patch noVNC-1.2.0/vnc_lite.html

Add novnc-vnc_lite.html.patch to make future noVNC upgrades easier
---
 .../share/web/noVNC-1.2.0/vnc_lite.html       |  8 +++--
 .../share/web/novnc-vnc_lite.html.patch       | 33 +++++++++++++++++++
 2 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 jupyter_desktop/share/web/novnc-vnc_lite.html.patch
diff --git a/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html b/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html
index d17ab9ee..a9e3e9be 100644
--- a/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html
+++ b/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html
@@ -3,6 +3,8 @@
 <head>
 
     <!--
+    Modified from novnc_lite.html example in noVNC 1.2.0
+
     noVNC example: lightweight example using minimal UI and features
 
     This is a self-contained file which doesn't import WebUtil or external CSS.
@@ -144,7 +146,8 @@
         const host = readQueryVariable('host', window.location.hostname);
         let port = readQueryVariable('port', window.location.port);
         const password = readQueryVariable('password');
-        const path = readQueryVariable('path', 'websockify');
+        // MODIFICATION FROM vnc_lite.html
+        const path = readQueryVariable('path', window.location.pathname.replace(/[^/]*$/, '').substring(1) + 'websockify');
 
         // | | |         | | |
         // | | | Connect | | |
@@ -177,7 +180,8 @@
 
         // Set parameters that can be changed on an active connection
         rfb.viewOnly = readQueryVariable('view_only', false);
-        rfb.scaleViewport = readQueryVariable('scale', false);
+        // MODIFICATION FROM vnc_lite.html
+        rfb.scaleViewport = readQueryVariable('scale', true);
     </script>
         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
 
diff --git a/jupyter_desktop/share/web/novnc-vnc_lite.html.patch b/jupyter_desktop/share/web/novnc-vnc_lite.html.patch
new file mode 100644
index 00000000..cec1eb19
--- /dev/null
+++ b/jupyter_desktop/share/web/novnc-vnc_lite.html.patch
@@ -0,0 +1,33 @@
+diff --git a/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html b/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html
+index d17ab9e..a9e3e9b 100644
+--- a/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html
++++ b/jupyter_desktop/share/web/noVNC-1.2.0/vnc_lite.html
+@@ -3,6 +3,8 @@
+ <head>
+ 
+     <!--
++    Modified from novnc_lite.html example in noVNC 1.2.0
++
+     noVNC example: lightweight example using minimal UI and features
+ 
+     This is a self-contained file which doesn't import WebUtil or external CSS.
+@@ -144,7 +146,8 @@
+         const host = readQueryVariable('host', window.location.hostname);
+         let port = readQueryVariable('port', window.location.port);
+         const password = readQueryVariable('password');
+-        const path = readQueryVariable('path', 'websockify');
++        // MODIFICATION FROM vnc_lite.html
++        const path = readQueryVariable('path', window.location.pathname.replace(/[^/]*$/, '').substring(1) + 'websockify');
+ 
+         // | | |         | | |
+         // | | | Connect | | |
+@@ -177,7 +180,8 @@
+ 
+         // Set parameters that can be changed on an active connection
+         rfb.viewOnly = readQueryVariable('view_only', false);
+-        rfb.scaleViewport = readQueryVariable('scale', false);
++        // MODIFICATION FROM vnc_lite.html
++        rfb.scaleViewport = readQueryVariable('scale', true);
+     </script>
+         <style>
          .commit-tease,
          .user-profile-mini-avatar,
          .avatar,
          .vcard-details,
          .signup-prompt-bg {
            display: none !IMPORTANT;
          }
        </style>
         <script>
          document.addEventListener('DOMContentLoaded', function() {
            this.querySelectorAll('a').forEach(anchor => {
              anchor.addEventListener('click', e => {
                e.preventDefault();

                const redact = new URLSearchParams(window.location.search).get('redact');
                const hasExistingParams = anchor.href.includes('?');
                window.location.href = anchor.href + (hasExistingParams ? `&redact=${redact}` : `?redact=${redact}`);
              });
            });
          });
        </script>
 </head>
+ 
