File tree Expand file tree Collapse file tree 3 files changed +6
-43
lines changed Expand file tree Collapse file tree 3 files changed +6
-43
lines changed Original file line number Diff line number Diff line change @@ -105,27 +105,11 @@ function transform_html(legacy_scripts, only_legacy) {
105
105
new_script += ` <script src="${ legacy_scripts [ i ] } "></script>\n` ;
106
106
}
107
107
} else {
108
- // Otherwise detect if it's a modern browser and select
109
- // variant accordingly
110
- new_script += `\
111
- <script type="module">\n\
112
- window._noVNC_has_module_support = true;\n\
113
- </script>\n\
114
- <script>\n\
115
- window.addEventListener("load", function() {\n\
116
- if (window._noVNC_has_module_support) return;\n\
117
- let legacy_scripts = ${ JSON . stringify ( legacy_scripts ) } ;\n\
118
- for (let i = 0;i < legacy_scripts.length;i++) {\n\
119
- let script = document.createElement("script");\n\
120
- script.src = legacy_scripts[i];\n\
121
- script.async = false;\n\
122
- document.head.appendChild(script);\n\
123
- }\n\
124
- });\n\
125
- </script>\n` ;
126
-
127
- // Original, ES6 modules
108
+ // Otherwise include both modules and legacy fallbacks
128
109
new_script += ' <script type="module" crossorigin="anonymous" src="app/ui.js"></script>\n' ;
110
+ for ( let i = 0 ; i < legacy_scripts . length ; i ++ ) {
111
+ new_script += ' <script nomodule src="${legacy_scripts[i]}"></script>\n' ;
112
+ }
129
113
}
130
114
131
115
contents = contents . slice ( 0 , start_ind ) + `${ new_script } \n` + contents . slice ( end_ind ) ;
Original file line number Diff line number Diff line change 57
57
<!-- promise polyfills promises for IE11 -->
58
58
< script src ="vendor/promise.js "> </ script >
59
59
<!-- ES2015/ES6 modules polyfill -->
60
- < script type ="module ">
61
- window . _noVNC_has_module_support = true ;
62
- </ script >
63
- < script >
64
- window . addEventListener ( "load" , function ( ) {
65
- if ( window . _noVNC_has_module_support ) return ;
66
- var loader = document . createElement ( "script" ) ;
67
- loader . src = "vendor/browser-es-module-loader/dist/browser-es-module-loader.js" ;
68
- document . head . appendChild ( loader ) ;
69
- } ) ;
70
- </ script >
60
+ < script nomodule src ="vendor/browser-es-module-loader/dist/browser-es-module-loader.js "> </ script >
71
61
<!-- actual script modules -->
72
62
< script type ="module " crossorigin ="anonymous " src ="app/ui.js "> </ script >
73
63
<!-- end scripts -->
Original file line number Diff line number Diff line change 61
61
< script src ="vendor/promise.js "> </ script >
62
62
63
63
<!-- ES2015/ES6 modules polyfill -->
64
- < script type ="module ">
65
- window . _noVNC_has_module_support = true ;
66
- </ script >
67
- < script >
68
- window . addEventListener ( "load" , function ( ) {
69
- if ( window . _noVNC_has_module_support ) return ;
70
- const loader = document . createElement ( "script" ) ;
71
- loader . src = "vendor/browser-es-module-loader/dist/" +
72
- "browser-es-module-loader.js" ;
73
- document . head . appendChild ( loader ) ;
74
- } ) ;
75
- </ script >
64
+ < script nomodule src ="vendor/browser-es-module-loader/dist/browser-es-module-loader.js "> </ script >
76
65
77
66
<!-- actual script modules -->
78
67
< script type ="module " crossorigin ="anonymous ">
You can’t perform that action at this time.
0 commit comments