From 36bdf136541599c0b7620cdece2cd6639d4b90e3 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 28 Apr 2017 14:38:59 +0200
Subject: [PATCH] Only load ES6 module loader polyfill if needed

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

diff --git a/vnc.html b/vnc.html
index b96b0aa1..3565edf7 100644
--- a/vnc.html
+++ b/vnc.html
@@ -65,7 +65,19 @@
     <!-- begin scripts -->
     <!-- 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" src="app/ui.js"></script>
     <!-- end scripts -->
 </head>