[infra] fix vendor import paths on built files

[mirror_novnc.git] / vnc.html
diff --git a/vnc.html b/vnc.html

index a212a26ee67c7ca033a87745448704b7d236a321..7845fa663666dc198cfae5d0c08b697bd64956ec 100644 (file)
--- a/vnc.html
+++ b/vnc.html
@@ -1,5 +1,5 @@
  <!DOCTYPE html>
-<html>
+<html class="noVNC_loading">
  <head>
  
      <!--
@@ -11,9 +11,9 @@
      This file is licensed under the 2-Clause BSD license (see LICENSE.txt).
  
      Connect parameters are provided in query string:
-        http://example.com/?host=HOST&port=PORT&encrypt=1&true_color=1
+        http://example.com/?host=HOST&port=PORT&encrypt=1
      or the fragment:
-        http://example.com/#host=HOST&port=PORT&encrypt=1&true_color=1
+        http://example.com/#host=HOST&port=PORT&encrypt=1
      -->
      <title>noVNC</title>
  
@@ -59,14 +59,37 @@
          src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
      -->
  
+    <!-- this is included as a normal file in order to catch script-loading errors as well -->
+    <script type="text/javascript" src="app/error-handler.js"></script>
+
+    <!-- begin scripts -->
+    <!-- promise polyfills promises for IE11 -->
+    <script src="vendor/promise.js"></script>
+    <!-- ES2015/ES6 modules polyfill -->
+    <script type="module">
+        window._noVNC_has_module_support = true;
+    </script>
+    <script>
+        window.addEventListener("load", function() {
+            if (window._noVNC_has_module_support) return;
+            var loader = document.createElement("script");
+            loader.src = "vendor/browser-es-module-loader/dist/browser-es-module-loader.js";
+            document.head.appendChild(loader);
+        });
+    </script>
+    <!-- actual script modules -->
+    <script type="module" src="app/ui.js"></script>
+    <!-- end scripts -->
  </head>
  
  <body>
  
-    <div id="noVNC_fallback_error">
-        <div>noVNC encountered an error:</div>
-        <br>
-        <div id="noVNC_fallback_errormsg"></div>
+    <div id="noVNC_fallback_error" class="noVNC_center">
+        <div>
+            <div>noVNC encountered an error:</div>
+            <br>
+            <div id="noVNC_fallback_errormsg"></div>
+        </div>
      </div>
  
      <!-- noVNC Control Bar -->
@@ -183,7 +206,7 @@
                      </li>
                      <li><hr></li>
                      <li>
-                        <label><input id="noVNC_setting_clip" type="checkbox" /> Clip to Window</label>
+                        <label><input id="noVNC_setting_view_clip" type="checkbox" /> Clip to Window</label>
                      </li>
                      <li>
                          <label for="noVNC_setting_resize">Scaling Mode:</label>
@@ -198,9 +221,6 @@
                      <li>
                          <div class="noVNC_expander">Advanced</div>
                          <div><ul>
-                            <li>
-                                <label><input id="noVNC_setting_true_color" type="checkbox" checked /> True Color</label>
-                            </li>
                              <li>
                                  <label><input id="noVNC_setting_cursor" type="checkbox" /> Local Cursor</label>
                              </li>
@@ -259,6 +279,8 @@
              </div>
          </div>
  
+        <div id="noVNC_control_bar_hint"></div>
+
      </div> <!-- End of noVNC_control_bar -->
  
      <!-- Status Dialog -->
@@ -320,12 +342,5 @@
          <source src="app/sounds/bell.oga" type="audio/ogg">
          <source src="app/sounds/bell.mp3" type="audio/mpeg">
      </audio>
-
-    <!-- begin scripts -->
-    <script src="core/util.js"></script>
-    <script src="app/webutil.js"></script>
-    <script src="app/ui.js"></script>
-    <!-- end scripts -->
-
   </body>
  </html>