RentAKloud/noVNC
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use "nomodule" instead of manual check

Browse Source 
Very few browsers are left in the wild that supports modules but not
"nomodule", so let's simplify our handling a bit.

Safari 10 supports modules but not 'nomodule', this means that this
particular version of Safari will be broken. Due to this we have to
bump up the required Safari version to 11.
This commit is contained in:
Pierre Ossman 2019-08-16 11:18:45 +02:00 committed by Samuel Mannehed
parent e1d50c8c10
commit 0b51419ca4
4 changed files with 7 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -89,7 +89,7 @@ noVNC uses many modern web technologies so a formal requirement list is
not available. However these are the minimum versions we are currently not available. However these are the minimum versions we are currently
aware of: aware of:
* Chrome 49, Firefox 44, Safari 10, Opera 36, IE 11, Edge 12 * Chrome 49, Firefox 44, Safari 11, Opera 36, IE 11, Edge 12
### Server Requirements ### Server Requirements

24
utils/use_require.js
View File

@ -105,27 +105,11 @@ function transform_html(legacy_scripts, only_legacy) {
new_script += ` <script src="${legacy_scripts[i]}"></script>\n`; new_script += ` <script src="${legacy_scripts[i]}"></script>\n`;
} }
} else { } else {
// Otherwise detect if it's a modern browser and select // Otherwise include both modules and legacy fallbacks
// variant accordingly
new_script += `\
<script type="module">\n\
window._noVNC_has_module_support = true;\n\
</script>\n\
<script>\n\
window.addEventListener("load", function() {\n\
if (window._noVNC_has_module_support) return;\n\
let legacy_scripts = ${JSON.stringify(legacy_scripts)};\n\
for (let i = 0;i < legacy_scripts.length;i++) {\n\
let script = document.createElement("script");\n\
script.src = legacy_scripts[i];\n\
script.async = false;\n\
document.head.appendChild(script);\n\
}\n\
});\n\
</script>\n`;
// Original, ES6 modules
new_script += ' <script type="module" crossorigin="anonymous" src="app/ui.js"></script>\n'; new_script += ' <script type="module" crossorigin="anonymous" src="app/ui.js"></script>\n';
for (let i = 0;i < legacy_scripts.length;i++) {
new_script += ' <script nomodule src="${legacy_scripts[i]}"></script>\n';
}
} }
contents = contents.slice(0, start_ind) + `${new_script}\n` + contents.slice(end_ind); contents = contents.slice(0, start_ind) + `${new_script}\n` + contents.slice(end_ind);

12
vnc.html
View File

@ -57,17 +57,7 @@
<!-- promise polyfills promises for IE11 --> <!-- promise polyfills promises for IE11 -->
<script src="vendor/promise.js"></script> <script src="vendor/promise.js"></script>
<!-- ES2015/ES6 modules polyfill --> <!-- ES2015/ES6 modules polyfill -->
<script type="module"> <script nomodule src="vendor/browser-es-module-loader/dist/browser-es-module-loader.js"></script>
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 --> <!-- actual script modules -->
<script type="module" crossorigin="anonymous" src="app/ui.js"></script> <script type="module" crossorigin="anonymous" src="app/ui.js"></script>
<!-- end scripts --> <!-- end scripts -->

13
vnc_lite.html
View File

@ -61,18 +61,7 @@
<script src="vendor/promise.js"></script> <script src="vendor/promise.js"></script>
<!-- ES2015/ES6 modules polyfill --> <!-- ES2015/ES6 modules polyfill -->
<script type="module"> <script nomodule src="vendor/browser-es-module-loader/dist/browser-es-module-loader.js"></script>
window._noVNC_has_module_support = true;
</script>
<script>
window.addEventListener("load", function() {
if (window._noVNC_has_module_support) return;
const 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 --> <!-- actual script modules -->
<script type="module" crossorigin="anonymous"> <script type="module" crossorigin="anonymous">