From 14ecdc62b461f66ac1ab6f0b6adcb51a40531fcc Mon Sep 17 00:00:00 2001
From: Frederik Carlier <frederik.carlier@quamotion.mobi>
Date: Fri, 29 Sep 2017 14:09:25 +0200
Subject: [PATCH] Only load ES6 module loader polyfill if needed

Safari and Chrome now have native support for modules, so we need to make sure we only load our polyfill when actually needed.
---
 vnc_lite.html | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/vnc_lite.html b/vnc_lite.html
index 68faf42c..729aabb1 100644
--- a/vnc_lite.html
+++ b/vnc_lite.html
@@ -60,7 +60,20 @@
 
     <!-- promise polyfills promises for IE11 -->
     <script src="vendor/promise.js"></script>
-    <script src="vendor/browser-es-module-loader/dist/browser-es-module-loader.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">
         // Load supporting scripts
         import * as WebUtil from './app/webutil.js';